diff options
| author | bors <bors@rust-lang.org> | 2025-01-12 23:08:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-12 23:08:30 +0000 |
| commit | e7ad3ae331bf2716389c10e01612e201a7f98c8d (patch) | |
| tree | fba1893a621dc7f495dd66d6bde0557061bf3d06 /compiler/rustc_data_structures/src/marker.rs | |
| parent | 48a426eca9df23b24b3559e545cf88dee61d4de9 (diff) | |
| parent | 223a7c12373034817eab620005397edd65b66ef8 (diff) | |
| download | rust-e7ad3ae331bf2716389c10e01612e201a7f98c8d.tar.gz rust-e7ad3ae331bf2716389c10e01612e201a7f98c8d.zip | |
Auto merge of #135420 - GuillaumeGomez:rollup-93vepka, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #135348 (rustdoc-json: Include items in stripped modules in `Crate::paths`.) - #135365 (Update the explanation for why we use box_new in vec!) - #135383 (De-abstract tagged ptr and make it covariant) - #135401 (Remove some empty expected files to fix blessing) - #135406 (Update unstable lint docs to include required feature attributes) - #135407 (Deny various clippy lints) - #135411 (run_make_support: add `#![warn(unreachable_pub)]`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src/marker.rs')
| -rw-r--r-- | compiler/rustc_data_structures/src/marker.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/marker.rs b/compiler/rustc_data_structures/src/marker.rs index 2b629024bfe..6ae97222f77 100644 --- a/compiler/rustc_data_structures/src/marker.rs +++ b/compiler/rustc_data_structures/src/marker.rs @@ -72,7 +72,7 @@ impl_dyn_send!( [Vec<T, A> where T: DynSend, A: std::alloc::Allocator + DynSend] [Box<T, A> where T: ?Sized + DynSend, A: std::alloc::Allocator + DynSend] [crate::sync::RwLock<T> where T: DynSend] - [crate::tagged_ptr::CopyTaggedPtr<P, T, CP> where P: Send + crate::tagged_ptr::Pointer, T: Send + crate::tagged_ptr::Tag, const CP: bool] + [crate::tagged_ptr::TaggedRef<'a, P, T> where 'a, P: Sync, T: Send + crate::tagged_ptr::Tag] [rustc_arena::TypedArena<T> where T: DynSend] [indexmap::IndexSet<V, S> where V: DynSend, S: DynSend] [indexmap::IndexMap<K, V, S> where K: DynSend, V: DynSend, S: DynSend] @@ -148,7 +148,7 @@ impl_dyn_sync!( [crate::sync::RwLock<T> where T: DynSend + DynSync] [crate::sync::WorkerLocal<T> where T: DynSend] [crate::intern::Interned<'a, T> where 'a, T: DynSync] - [crate::tagged_ptr::CopyTaggedPtr<P, T, CP> where P: Sync + crate::tagged_ptr::Pointer, T: Sync + crate::tagged_ptr::Tag, const CP: bool] + [crate::tagged_ptr::TaggedRef<'a, P, T> where 'a, P: Sync, T: Sync + crate::tagged_ptr::Tag] [parking_lot::lock_api::Mutex<R, T> where R: DynSync, T: ?Sized + DynSend] [parking_lot::lock_api::RwLock<R, T> where R: DynSync, T: ?Sized + DynSend + DynSync] [indexmap::IndexSet<V, S> where V: DynSync, S: DynSync] |