diff options
| author | bors <bors@rust-lang.org> | 2023-05-09 08:16:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-09 08:16:26 +0000 |
| commit | ecd3dbab4ed82abfa05e22069261e565239449cf (patch) | |
| tree | 03ec27f0a1765fca86fd800b41e83c39c0bd529d /compiler/rustc_data_structures/src | |
| parent | 7e7483d26e3cec7a44ef00cf7ae6c9c8c918bec6 (diff) | |
| parent | 9d913eb9e4eb2a433e8755e1359c1cccb344ad3f (diff) | |
| download | rust-ecd3dbab4ed82abfa05e22069261e565239449cf.tar.gz rust-ecd3dbab4ed82abfa05e22069261e565239449cf.zip | |
Auto merge of #111380 - Dylan-DPC:rollup-xiptbhn, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #110304 (Add GNU Property Note) - #110504 (Tweak borrow suggestion span) - #110583 (tweak "make mut" spans when assigning to locals) - #110694 (Implement builtin # syntax and use it for offset_of!(...)) - #111120 (Suggest let for possible binding with ty) - #111252 (Min specialization improvements) - #111361 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/owned_slice.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_data_structures/src/owned_slice.rs b/compiler/rustc_data_structures/src/owned_slice.rs index 048401f66c2..311a42aa42a 100644 --- a/compiler/rustc_data_structures/src/owned_slice.rs +++ b/compiler/rustc_data_structures/src/owned_slice.rs @@ -109,9 +109,11 @@ impl Borrow<[u8]> for OwnedSlice { } // Safety: `OwnedSlice` is conceptually `(&'self.1 [u8], Box<dyn Send + Sync>)`, which is `Send` +#[cfg(parallel_compiler)] unsafe impl Send for OwnedSlice {} // Safety: `OwnedSlice` is conceptually `(&'self.1 [u8], Box<dyn Send + Sync>)`, which is `Sync` +#[cfg(parallel_compiler)] unsafe impl Sync for OwnedSlice {} #[cfg(test)] |