Skip to content

Commit 16e0760

Browse files
committed
std::comm: Remove Freeze / NoFreeze
1 parent 0169abd commit 16e0760

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/libstd/comm/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ pub struct Receiver<T> {
291291
priv inner: Flavor<T>,
292292
priv receives: Cell<uint>,
293293
// can't share in an arc
294-
priv marker: marker::NoFreeze,
294+
priv marker: marker::NoShare,
295295
}
296296

297297
/// An iterator over messages on a receiver, this iterator will block
@@ -307,7 +307,7 @@ pub struct Sender<T> {
307307
priv inner: Flavor<T>,
308308
priv sends: Cell<uint>,
309309
// can't share in an arc
310-
priv marker: marker::NoFreeze,
310+
priv marker: marker::NoShare,
311311
}
312312

313313
/// 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>) {
340340

341341
impl<T: Send> Sender<T> {
342342
fn my_new(inner: Flavor<T>) -> Sender<T> {
343-
Sender { inner: inner, sends: Cell::new(0), marker: marker::NoFreeze }
343+
Sender { inner: inner, sends: Cell::new(0), marker: marker::NoShare }
344344
}
345345

346346
/// Sends a value along this channel to be received by the corresponding
@@ -478,7 +478,7 @@ impl<T: Send> Drop for Sender<T> {
478478

479479
impl<T: Send> Receiver<T> {
480480
fn my_new(inner: Flavor<T>) -> Receiver<T> {
481-
Receiver { inner: inner, receives: Cell::new(0), marker: marker::NoFreeze }
481+
Receiver { inner: inner, receives: Cell::new(0), marker: marker::NoShare }
482482
}
483483

484484
/// Blocks waiting for a value on this receiver

src/libstd/comm/select.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ pub struct Select {
6666
priv tail: *mut Handle<'static, ()>,
6767
priv next_id: Cell<uint>,
6868
priv marker1: marker::NoSend,
69-
priv marker2: marker::NoFreeze,
7069
}
7170

7271
/// A handle to a receiver which is currently a member of a `Select` set of
@@ -105,7 +104,6 @@ impl Select {
105104
pub fn new() -> Select {
106105
Select {
107106
marker1: marker::NoSend,
108-
marker2: marker::NoFreeze,
109107
head: 0 as *mut Handle<'static, ()>,
110108
tail: 0 as *mut Handle<'static, ()>,
111109
next_id: Cell::new(1),

0 commit comments

Comments
 (0)