summary refs log tree commit diff
path: root/src/libstd/sync/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2015-08-19 15:00:11 -0700
committerSteven Fackler <sfackler@gmail.com>2015-08-19 17:00:15 -0700
commitb1c7a46c0db2cd73575792aebe08108b53289d80 (patch)
tree8294ae7a04a01b8cd19d4e93de51988d88478e2d /src/libstd/sync/mod.rs
parent46156de5f1d8a4ebfb874d170ba6844462b5781b (diff)
downloadrust-b1c7a46c0db2cd73575792aebe08108b53289d80.tar.gz
rust-b1c7a46c0db2cd73575792aebe08108b53289d80.zip
Turn TimedOut into a BarrierWaitResult style opaque type
Diffstat (limited to 'src/libstd/sync/mod.rs')
-rw-r--r--src/libstd/sync/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs
index 8539311f823..ae21503cf67 100644
--- a/src/libstd/sync/mod.rs
+++ b/src/libstd/sync/mod.rs
@@ -21,7 +21,7 @@ pub use alloc::arc::{Arc, Weak};
 pub use core::atomic;
 
 pub use self::barrier::{Barrier, BarrierWaitResult};
-pub use self::condvar::{Condvar, StaticCondvar, TimedOut, CONDVAR_INIT};
+pub use self::condvar::{Condvar, StaticCondvar, WaitTimeoutResult, CONDVAR_INIT};
 pub use self::mutex::MUTEX_INIT;
 pub use self::mutex::{Mutex, MutexGuard, StaticMutex};
 pub use self::once::{Once, ONCE_INIT};