diff options
| author | bors <bors@rust-lang.org> | 2023-09-03 07:35:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-03 07:35:33 +0000 |
| commit | f2568c8316805749fe616e3de08c3f7c2bec3680 (patch) | |
| tree | 62acd3e15506a4b53b29a70b7882c0c2fa0352b4 /compiler/rustc_data_structures/src | |
| parent | d2f5dc9745defa7cb90a88dd8adc7d347f42d0bc (diff) | |
| parent | fb26c21c356075c0cd35d98fa0b786b7633249d8 (diff) | |
| download | rust-f2568c8316805749fe616e3de08c3f7c2bec3680.tar.gz rust-f2568c8316805749fe616e3de08c3f7c2bec3680.zip | |
Auto merge of #3050 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/sync.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/sync.rs b/compiler/rustc_data_structures/src/sync.rs index 2ec509b9118..e82b0f6d496 100644 --- a/compiler/rustc_data_structures/src/sync.rs +++ b/compiler/rustc_data_structures/src/sync.rs @@ -273,7 +273,7 @@ cfg_if! { pub use std::cell::RefMut as MappedWriteGuard; pub use std::cell::RefMut as MappedLockGuard; - pub use std::cell::OnceCell; + pub use std::cell::OnceCell as OnceLock; use std::cell::RefCell as InnerRwLock; @@ -327,7 +327,7 @@ cfg_if! { pub use parking_lot::MappedMutexGuard as MappedLockGuard; - pub use std::sync::OnceLock as OnceCell; + pub use std::sync::OnceLock; pub use std::sync::atomic::{AtomicBool, AtomicUsize, AtomicU32, AtomicU64}; |