diff options
| author | bors <bors@rust-lang.org> | 2018-09-05 03:04:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-05 03:04:20 +0000 |
| commit | 0be2c303692cab31390e52701007cfa87867bf74 (patch) | |
| tree | a7a48f343f3573463febf77234d4d674f524d522 /src/librustc_data_structures | |
| parent | f68b7cc59896427d378c9e3bae6f5fd7a1f1fad9 (diff) | |
| parent | 9ec5ef541ad17986bfe6ae067a84ea8f7b7ae133 (diff) | |
| download | rust-0be2c303692cab31390e52701007cfa87867bf74.tar.gz rust-0be2c303692cab31390e52701007cfa87867bf74.zip | |
Auto merge of #53075 - Mark-Simulacrum:update-cargolock, r=alexcrichton
Update Cargo.lock This also includes major version bumps for the rand crate used by core, std, and alloc tests, among other crates (regex, etc.) used elsewhere. Since these are all internal there should be no user-visible changes. r? @alexcrichton
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; |