diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-04 16:24:39 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-09-04 13:22:08 -0600 |
| commit | 9ec5ef541ad17986bfe6ae067a84ea8f7b7ae133 (patch) | |
| tree | b66ab3ff4520b7abc1ea542ab3447c6d15e9047d /src/librustc_data_structures | |
| parent | 1c2e17f4e3a2070a7f703f51e29c1c388ef703b6 (diff) | |
| download | rust-9ec5ef541ad17986bfe6ae067a84ea8f7b7ae133.tar.gz rust-9ec5ef541ad17986bfe6ae067a84ea8f7b7ae133.zip | |
Breaking change upgrades
Diffstat (limited to 'src/librustc_data_structures')
| -rw-r--r-- | src/librustc_data_structures/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/librustc_data_structures/sync.rs | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/librustc_data_structures/Cargo.toml b/src/librustc_data_structures/Cargo.toml index 0376cf81157..5a72fde6a2c 100644 --- a/src/librustc_data_structures/Cargo.toml +++ b/src/librustc_data_structures/Cargo.toml @@ -22,5 +22,5 @@ rustc-hash = "1.0.1" smallvec = { version = "0.6.5", features = ["union"] } [dependencies.parking_lot] -version = "0.5" +version = "0.6" features = ["nightly"] diff --git a/src/librustc_data_structures/sync.rs b/src/librustc_data_structures/sync.rs index 6989cdc0a9a..a2893a60cb6 100644 --- a/src/librustc_data_structures/sync.rs +++ b/src/librustc_data_structures/sync.rs @@ -93,8 +93,11 @@ cfg_if! { pub use std::rc::Rc as Lrc; pub use std::rc::Weak as Weak; pub use std::cell::Ref as ReadGuard; + pub use std::cell::Ref as MappedReadGuard; pub use std::cell::RefMut as WriteGuard; + pub use std::cell::RefMut as MappedWriteGuard; pub use std::cell::RefMut as LockGuard; + pub use std::cell::RefMut as MappedLockGuard; use std::cell::RefCell as InnerRwLock; use std::cell::RefCell as InnerLock; @@ -213,9 +216,12 @@ cfg_if! { pub use std::marker::Sync as Sync; pub use parking_lot::RwLockReadGuard as ReadGuard; + pub use parking_lot::MappedRwLockReadGuard as MappedReadGuard; pub use parking_lot::RwLockWriteGuard as WriteGuard; + pub use parking_lot::MappedRwLockWriteGuard as MappedWriteGuard; pub use parking_lot::MutexGuard as LockGuard; + pub use parking_lot::MappedMutexGuard as MappedLockGuard; pub use std::sync::Arc as Lrc; pub use std::sync::Weak as Weak; |