diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-01-07 11:33:42 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-01-07 12:10:31 +1300 |
| commit | 9f07d055f7823ac0e17e014f3effa2a0be0947e9 (patch) | |
| tree | b4a0f390cd26323522cbcfaf7ba2464fc5f13bb2 /src/libstd/sync/mpsc/mod.rs | |
| parent | 91ba66fa99830d4963d6adb47439b86253bf5a4c (diff) | |
| download | rust-9f07d055f7823ac0e17e014f3effa2a0be0947e9.tar.gz rust-9f07d055f7823ac0e17e014f3effa2a0be0947e9.zip | |
markers -> marker
Diffstat (limited to 'src/libstd/sync/mpsc/mod.rs')
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 4d18d9e6e9d..5dc58add665 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -319,7 +319,7 @@ use prelude::v1::*; use sync::Arc; use fmt; -use markers; +use marker; use mem; use cell::UnsafeCell; @@ -373,7 +373,7 @@ unsafe impl<T:Send> Send for Sender<T> { } pub struct SyncSender<T> { inner: Arc<RacyCell<sync::Packet<T>>>, // can't share in an arc - _marker: markers::NoSync, + _marker: marker::NoSync, } /// An error returned from the `send` function on channels. @@ -678,7 +678,7 @@ impl<T: Send> Drop for Sender<T> { impl<T: Send> SyncSender<T> { fn new(inner: Arc<RacyCell<sync::Packet<T>>>) -> SyncSender<T> { - SyncSender { inner: inner, _marker: markers::NoSync } + SyncSender { inner: inner, _marker: marker::NoSync } } /// Sends a value on this synchronous channel. |
