diff options
| author | bors <bors@rust-lang.org> | 2019-02-28 11:38:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-28 11:38:40 +0000 |
| commit | 190feb65290d39d7ab6d44e994bd99188d339f16 (patch) | |
| tree | 0dc440124b61d17495c4b8e4e680b38cd7b0fa13 /src/libstd/sync/mod.rs | |
| parent | 7e001e5c6c7c090b41416a57d4be412ed3ccd937 (diff) | |
| parent | aad9e29f52988c55cd8cee2bd181a2e3c9d436a4 (diff) | |
| download | rust-190feb65290d39d7ab6d44e994bd99188d339f16.tar.gz rust-190feb65290d39d7ab6d44e994bd99188d339f16.zip | |
Auto merge of #58208 - taiki-e:libstd-2018, r=Centril
libstd => 2018 Transitions `libstd` to Rust 2018; cc #58099 r? @Centril
Diffstat (limited to 'src/libstd/sync/mod.rs')
| -rw-r--r-- | src/libstd/sync/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs index 3d11af7dc10..809ee882698 100644 --- a/src/libstd/sync/mod.rs +++ b/src/libstd/sync/mod.rs @@ -165,7 +165,7 @@ pub use self::mutex::{Mutex, MutexGuard}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::once::{Once, OnceState, ONCE_INIT}; #[stable(feature = "rust1", since = "1.0.0")] -pub use sys_common::poison::{PoisonError, TryLockError, TryLockResult, LockResult}; +pub use crate::sys_common::poison::{PoisonError, TryLockError, TryLockResult, LockResult}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::rwlock::{RwLock, RwLockReadGuard, RwLockWriteGuard}; |