diff options
| author | bors <bors@rust-lang.org> | 2016-05-14 07:15:45 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-14 07:15:45 -0700 |
| commit | 5f6eb14b28eab9824492f9f82f5f25ad56dda30a (patch) | |
| tree | d9dff34777a8572efa8506ca3991ff6bb8bed546 /src/libstd | |
| parent | 6ba8a1a657cf37e648166ee4b41f51768ea46c1e (diff) | |
| parent | c91b1048847663fabf99cd48dd1d9bb1644bcd77 (diff) | |
| download | rust-5f6eb14b28eab9824492f9f82f5f25ad56dda30a.tar.gz rust-5f6eb14b28eab9824492f9f82f5f25ad56dda30a.zip | |
Auto merge of #33563 - Amanieu:oncestate, r=alexcrichton
Export OnceState from libstd This type is used in the signature of `call_once_force` but isn't exported from libstd. r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -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 c20b422d40c..21008ee3989 100644 --- a/src/libstd/sync/mod.rs +++ b/src/libstd/sync/mod.rs @@ -31,7 +31,7 @@ pub use self::mutex::MUTEX_INIT; #[stable(feature = "rust1", since = "1.0.0")] pub use self::mutex::{Mutex, MutexGuard, StaticMutex}; #[stable(feature = "rust1", since = "1.0.0")] -pub use self::once::{Once, ONCE_INIT}; +pub use self::once::{Once, OnceState, ONCE_INIT}; #[stable(feature = "rust1", since = "1.0.0")] pub use sys_common::poison::{PoisonError, TryLockError, TryLockResult, LockResult}; #[stable(feature = "rust1", since = "1.0.0")] |