aboutsummaryrefslogtreecommitdiff
path: root/ctr-std/src/sync/mod.rs
diff options
context:
space:
mode:
authorFenrir <[email protected]>2017-02-20 22:24:01 -0700
committerFenrir <[email protected]>2017-02-20 22:24:01 -0700
commit1e3655e44af528844be2c4ef32e123be1421c7e4 (patch)
treee7432275077b8ba29b39160eec9a17cab62e8138 /ctr-std/src/sync/mod.rs
parentMerge pull request #19 from FenrirWolf/thread_local (diff)
downloadctru-rs-1e3655e44af528844be2c4ef32e123be1421c7e4.tar.xz
ctru-rs-1e3655e44af528844be2c4ef32e123be1421c7e4.zip
Add sync::mutex
Diffstat (limited to 'ctr-std/src/sync/mod.rs')
-rw-r--r--ctr-std/src/sync/mod.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/ctr-std/src/sync/mod.rs b/ctr-std/src/sync/mod.rs
index 487c4c9..df954cd 100644
--- a/ctr-std/src/sync/mod.rs
+++ b/ctr-std/src/sync/mod.rs
@@ -21,9 +21,9 @@
pub use alloc::arc::{Arc, Weak};
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::sync::atomic;
+#[stable(feature = "rust1", since = "1.0.0")]
+pub use self::mutex::{Mutex, MutexGuard};
+#[stable(feature = "rust1", since = "1.0.0")]
+pub use sys_common::poison::{PoisonError, TryLockError, TryLockResult, LockResult};
-// Easy cheat until we get proper locks based on libctru code
-#[stable(feature = "3ds", since = "1.0.0")]
-pub use spin::{Mutex, MutexGuard};
-#[stable(feature = "3ds", since = "1.0.0")]
-pub use spin::{RwLock, RwLockReadGuard, RwLockWriteGuard};
+mod mutex;