Unrolled build for rust-lang#121847

rust-timer · web-flow · commit 3e2cadc1f3df · 2024-03-02T08:45:54.000-05:00
Rollup merge of rust-lang#121847 - shamatar:btreemap_fix_implicits, r=cuviper Remove hidden use of Global Fixes rust-lang#121797
diff --git a/library/alloc/src/collections/btree/map.rs b/library/alloc/src/collections/btree/map.rs
@@ -180,7 +180,7 @@ pub struct BTreeMap<
     /// `ManuallyDrop` to control drop order (needs to be dropped after all the nodes).
     pub(super) alloc: ManuallyDrop<A>,
     // For dropck; the `Box` avoids making the `Unpin` impl more strict than before
-    _marker: PhantomData<crate::boxed::Box<(K, V)>>,
+    _marker: PhantomData<crate::boxed::Box<(K, V), A>>,
 }
 
 #[stable(feature = "btree_drop", since = "1.7.0")]

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ pub struct BTreeMap<`
`180`	`180`	/// `ManuallyDrop` to control drop order (needs to be dropped after all the nodes).
`181`	`181`	`pub(super) alloc: ManuallyDrop<A>,`
`182`	`182`	// For dropck; the `Box` avoids making the `Unpin` impl more strict than before
`183`		`- _marker: PhantomData<crate::boxed::Box<(K, V)>>,`
	`183`	`+ _marker: PhantomData<crate::boxed::Box<(K, V), A>>,`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`#[stable(feature = "btree_drop", since = "1.7.0")]`