nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 04:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #121847 - shamatar:btreemap_fix_implicits, r=cuviper

Browse Source 
Remove hidden use of Global

Fixes #121797
This commit is contained in:
Matthias Krüger 2024-03-02 10:09:37 +01:00 committed by GitHub
commit 78249a6790
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/alloc/src/collections/btree/map.rs
View File

@ -180,7 +180,7 @@ pub struct BTreeMap<
/// `ManuallyDrop` to control drop order (needs to be dropped after all the nodes). /// `ManuallyDrop` to control drop order (needs to be dropped after all the nodes).
pub(super) alloc: ManuallyDrop<A>, pub(super) alloc: ManuallyDrop<A>,
// For dropck; the `Box` avoids making the `Unpin` impl more strict than before // 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")] #[stable(feature = "btree_drop", since = "1.7.0")]