diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-08-13 16:20:27 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-08-13 18:59:48 -0700 |
| commit | 5394e34aa43687e36fb94656faf075b125c43bb5 (patch) | |
| tree | 2553a2abb61083a94278e956259a194cfecc470f /src/libstd/arc.rs | |
| parent | 6b43c0c1add8d2caaa3c391d8d8daca2c609047e (diff) | |
| download | rust-5394e34aa43687e36fb94656faf075b125c43bb5.tar.gz rust-5394e34aa43687e36fb94656faf075b125c43bb5.zip | |
core: Camel case some lesser-used modules
Diffstat (limited to 'src/libstd/arc.rs')
| -rw-r--r-- | src/libstd/arc.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs index 4b01e77b22a..03261ec0025 100644 --- a/src/libstd/arc.rs +++ b/src/libstd/arc.rs @@ -3,7 +3,8 @@ * between tasks. */ -import unsafe::{shared_mutable_state, clone_shared_mutable_state, +import unsafe::{SharedMutableState, + shared_mutable_state, clone_shared_mutable_state, get_shared_mutable_state, get_shared_immutable_state}; import sync; import sync::{mutex, rwlock}; @@ -39,7 +40,7 @@ impl &condvar { ****************************************************************************/ /// An atomically reference counted wrapper for shared immutable state. -struct arc<T: const send> { x: shared_mutable_state<T>; } +struct arc<T: const send> { x: SharedMutableState<T>; } /// Create an atomically reference counted wrapper. fn arc<T: const send>(+data: T) -> arc<T> { @@ -71,7 +72,7 @@ fn clone<T: const send>(rc: &arc<T>) -> arc<T> { struct mutex_arc_inner<T: send> { lock: mutex; failed: bool; data: T; } /// An ARC with mutable data protected by a blocking mutex. -struct mutex_arc<T: send> { x: shared_mutable_state<mutex_arc_inner<T>>; } +struct mutex_arc<T: send> { x: SharedMutableState<mutex_arc_inner<T>>; } /// Create a mutex-protected ARC with the supplied data. fn mutex_arc<T: send>(+user_data: T) -> mutex_arc<T> { @@ -176,7 +177,7 @@ struct rw_arc_inner<T: const send> { lock: rwlock; failed: bool; data: T; } * Unlike mutex_arcs, rw_arcs are safe, because they cannot be nested. */ struct rw_arc<T: const send> { - x: shared_mutable_state<rw_arc_inner<T>>; + x: SharedMutableState<rw_arc_inner<T>>; mut cant_nest: (); } |
