diff options
| author | Flavio Percoco <flaper87@gmail.com> | 2014-03-21 23:48:24 +0100 |
|---|---|---|
| committer | Flavio Percoco <flaper87@gmail.com> | 2014-03-22 15:47:34 +0100 |
| commit | 16e07602f9281a846f5142f8cd6d8f578bcbcf37 (patch) | |
| tree | 6013c5efd6f063e6f8616ef19f3fcaffaa2ed48c /src/libstd | |
| parent | 0169abd91db39144d5a53acaa04fe7c0e6d92fa6 (diff) | |
| download | rust-16e07602f9281a846f5142f8cd6d8f578bcbcf37.tar.gz rust-16e07602f9281a846f5142f8cd6d8f578bcbcf37.zip | |
std::comm: Remove Freeze / NoFreeze
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/comm/mod.rs | 8 | ||||
| -rw-r--r-- | src/libstd/comm/select.rs | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/libstd/comm/mod.rs b/src/libstd/comm/mod.rs index e25571dd246..267140a0089 100644 --- a/src/libstd/comm/mod.rs +++ b/src/libstd/comm/mod.rs @@ -291,7 +291,7 @@ pub struct Receiver<T> { priv inner: Flavor<T>, priv receives: Cell<uint>, // can't share in an arc - priv marker: marker::NoFreeze, + priv marker: marker::NoShare, } /// An iterator over messages on a receiver, this iterator will block @@ -307,7 +307,7 @@ pub struct Sender<T> { priv inner: Flavor<T>, priv sends: Cell<uint>, // can't share in an arc - priv marker: marker::NoFreeze, + priv marker: marker::NoShare, } /// This enumeration is the list of the possible reasons that try_recv could not @@ -340,7 +340,7 @@ pub fn channel<T: Send>() -> (Sender<T>, Receiver<T>) { impl<T: Send> Sender<T> { fn my_new(inner: Flavor<T>) -> Sender<T> { - Sender { inner: inner, sends: Cell::new(0), marker: marker::NoFreeze } + Sender { inner: inner, sends: Cell::new(0), marker: marker::NoShare } } /// Sends a value along this channel to be received by the corresponding @@ -478,7 +478,7 @@ impl<T: Send> Drop for Sender<T> { impl<T: Send> Receiver<T> { fn my_new(inner: Flavor<T>) -> Receiver<T> { - Receiver { inner: inner, receives: Cell::new(0), marker: marker::NoFreeze } + Receiver { inner: inner, receives: Cell::new(0), marker: marker::NoShare } } /// Blocks waiting for a value on this receiver diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs index 3e134b92493..5872c308f93 100644 --- a/src/libstd/comm/select.rs +++ b/src/libstd/comm/select.rs @@ -66,7 +66,6 @@ pub struct Select { priv tail: *mut Handle<'static, ()>, priv next_id: Cell<uint>, priv marker1: marker::NoSend, - priv marker2: marker::NoFreeze, } /// A handle to a receiver which is currently a member of a `Select` set of @@ -105,7 +104,6 @@ impl Select { pub fn new() -> Select { Select { marker1: marker::NoSend, - marker2: marker::NoFreeze, head: 0 as *mut Handle<'static, ()>, tail: 0 as *mut Handle<'static, ()>, next_id: Cell::new(1), |