Skip to content

Commit

Permalink
Unrolled build for rust-lang#121847
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#121847 - shamatar:btreemap_fix_implicits, r=cuviper

Remove hidden use of Global

Fixes rust-lang#121797
  • Loading branch information
rust-timer authored Mar 2, 2024
2 parents 2e3581b + fb8ac06 commit 3e2cadc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/alloc/src/collections/btree/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down

0 comments on commit 3e2cadc

Please sign in to comment.