Skip to content

Commit a03348a

Browse files
committed
---
yaml --- r: 109323 b: refs/heads/dist-snap c: eff0257 h: refs/heads/master i: 109321: 954fe68 109319: 077b90e v: v3
1 parent 0ba40a5 commit a03348a

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 64a52de8236e6405a50150c910370e161b854927
9+
refs/heads/dist-snap: eff025797a6dc58dad724e8523223d07025ac697
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libsync/lib.rs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,28 @@
2020
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2121
html_root_url = "http://static.rust-lang.org/doc/master")];
2222
#[feature(phase)];
23+
#[deny(missing_doc, deprecated_owned_vector)];
2324

24-
#[cfg(test)] #[phase(syntax, link)] extern crate log;
25+
#[cfg(test)]
26+
#[phase(syntax, link)] extern crate log;
2527

26-
pub use arc::{Arc, MutexArc, RWArc, RWWriteMode, RWReadMode, ArcCondvar, CowArc};
27-
pub use sync::{Mutex, RWLock, Condvar, Semaphore, RWLockWriteMode,
28-
RWLockReadMode, Barrier, one, mutex};
2928
pub use comm::{DuplexStream, SyncSender, SyncReceiver, rendezvous, duplex};
3029
pub use task_pool::TaskPool;
3130
pub use future::Future;
31+
pub use arc::{Arc, Weak};
32+
pub use lock::{Mutex, MutexGuard, Condvar, Barrier,
33+
RWLock, RWLockReadGuard, RWLockWriteGuard};
34+
35+
// The mutex/rwlock in this module are not meant for reexport
36+
pub use raw::{Semaphore, SemaphoreGuard};
3237

3338
mod arc;
34-
mod sync;
3539
mod comm;
36-
mod task_pool;
3740
mod future;
41+
mod lock;
42+
mod mpsc_intrusive;
43+
mod task_pool;
44+
45+
pub mod raw;
46+
pub mod mutex;
47+
pub mod one;

0 commit comments

Comments
 (0)