Skip to content

Commit e7ad3ae

Browse files
committed
Auto merge of rust-lang#135420 - GuillaumeGomez:rollup-93vepka, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - rust-lang#135348 (rustdoc-json: Include items in stripped modules in `Crate::paths`.) - rust-lang#135365 (Update the explanation for why we use box_new in vec!) - rust-lang#135383 (De-abstract tagged ptr and make it covariant) - rust-lang#135401 (Remove some empty expected files to fix blessing) - rust-lang#135406 (Update unstable lint docs to include required feature attributes) - rust-lang#135407 (Deny various clippy lints) - rust-lang#135411 (run_make_support: add `#![warn(unreachable_pub)]`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 48a426e + 223a7c1 commit e7ad3ae

File tree

25 files changed

+483
-1012
lines changed

25 files changed

+483
-1012
lines changed

compiler/rustc_data_structures/src/marker.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl_dyn_send!(
7272
[Vec<T, A> where T: DynSend, A: std::alloc::Allocator + DynSend]
7373
[Box<T, A> where T: ?Sized + DynSend, A: std::alloc::Allocator + DynSend]
7474
[crate::sync::RwLock<T> where T: DynSend]
75-
[crate::tagged_ptr::CopyTaggedPtr<P, T, CP> where P: Send + crate::tagged_ptr::Pointer, T: Send + crate::tagged_ptr::Tag, const CP: bool]
75+
[crate::tagged_ptr::TaggedRef<'a, P, T> where 'a, P: Sync, T: Send + crate::tagged_ptr::Tag]
7676
[rustc_arena::TypedArena<T> where T: DynSend]
7777
[indexmap::IndexSet<V, S> where V: DynSend, S: DynSend]
7878
[indexmap::IndexMap<K, V, S> where K: DynSend, V: DynSend, S: DynSend]
@@ -148,7 +148,7 @@ impl_dyn_sync!(
148148
[crate::sync::RwLock<T> where T: DynSend + DynSync]
149149
[crate::sync::WorkerLocal<T> where T: DynSend]
150150
[crate::intern::Interned<'a, T> where 'a, T: DynSync]
151-
[crate::tagged_ptr::CopyTaggedPtr<P, T, CP> where P: Sync + crate::tagged_ptr::Pointer, T: Sync + crate::tagged_ptr::Tag, const CP: bool]
151+
[crate::tagged_ptr::TaggedRef<'a, P, T> where 'a, P: Sync, T: Sync + crate::tagged_ptr::Tag]
152152
[parking_lot::lock_api::Mutex<R, T> where R: DynSync, T: ?Sized + DynSend]
153153
[parking_lot::lock_api::RwLock<R, T> where R: DynSync, T: ?Sized + DynSend + DynSync]
154154
[indexmap::IndexSet<V, S> where V: DynSync, S: DynSync]

0 commit comments

Comments
 (0)