diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2014-02-15 11:18:49 +1100 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2014-02-16 10:13:56 +1100 |
| commit | b87ed605c0ef27f5532ec30c92128bd890de5955 (patch) | |
| tree | 55810612bec1de77a67738853ea98539582fa809 /src/libsync/sync | |
| parent | 75d92dbabe5bab3a1ca85c305a3773bca2e38145 (diff) | |
| download | rust-b87ed605c0ef27f5532ec30c92128bd890de5955.tar.gz rust-b87ed605c0ef27f5532ec30c92128bd890de5955.zip | |
std: Rename unstable::mutex::Mutex to StaticNativeMutex.
This better reflects its purpose and design.
Diffstat (limited to 'src/libsync/sync')
| -rw-r--r-- | src/libsync/sync/mutex.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsync/sync/mutex.rs b/src/libsync/sync/mutex.rs index f5914b26e85..b37e2f3a45d 100644 --- a/src/libsync/sync/mutex.rs +++ b/src/libsync/sync/mutex.rs @@ -133,7 +133,7 @@ pub struct StaticMutex { /// uint-cast of the native thread waiting for this mutex priv native_blocker: uint, /// an OS mutex used by native threads - priv lock: mutex::Mutex, + priv lock: mutex::StaticNativeMutex, /// A concurrent mpsc queue used by green threads, along with a count used /// to figure out when to dequeue and enqueue. @@ -150,7 +150,7 @@ pub struct Guard<'a> { /// Static initialization of a mutex. This constant can be used to initialize /// other mutex constants. pub static MUTEX_INIT: StaticMutex = StaticMutex { - lock: mutex::MUTEX_INIT, + lock: mutex::NATIVE_MUTEX_INIT, state: atomics::INIT_ATOMIC_UINT, flavor: Unlocked, green_blocker: 0, @@ -441,7 +441,7 @@ impl Mutex { native_blocker: 0, green_cnt: atomics::AtomicUint::new(0), q: q::Queue::new(), - lock: unsafe { mutex::Mutex::new() }, + lock: unsafe { mutex::StaticNativeMutex::new() }, } } } |
