diff options
| author | Aaron Turon <aturon@mozilla.com> | 2014-09-14 20:27:36 -0700 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2014-09-16 14:37:48 -0700 |
| commit | fc525eeb4ec3443d29bce677f589b19f31c189bb (patch) | |
| tree | d807bad5c91171751157a945dde963dcfd4ea95e /src/libsync/comm | |
| parent | d8dfe1957b6541de8fe2797e248fe4bd2fac02d9 (diff) | |
| download | rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.tar.gz rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.zip | |
Fallout from renaming
Diffstat (limited to 'src/libsync/comm')
| -rw-r--r-- | src/libsync/comm/mod.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/libsync/comm/mod.rs b/src/libsync/comm/mod.rs index e46f52b3ad7..4e66dd69a60 100644 --- a/src/libsync/comm/mod.rs +++ b/src/libsync/comm/mod.rs @@ -654,7 +654,7 @@ impl<T: Send> Sender<T> { unsafe { let tmp = Sender::new(Stream(new_inner)); - mem::swap(self.mut_inner(), tmp.mut_inner()); + mem::swap(self.inner_mut(), tmp.inner_mut()); } return ret; } @@ -695,7 +695,7 @@ impl<T: Send> Clone for Sender<T> { (*packet.get()).inherit_blocker(sleeper); let tmp = Sender::new(Shared(packet.clone())); - mem::swap(self.mut_inner(), tmp.mut_inner()); + mem::swap(self.inner_mut(), tmp.inner_mut()); } Sender::new(Shared(packet)) } @@ -704,7 +704,7 @@ impl<T: Send> Clone for Sender<T> { #[unsafe_destructor] impl<T: Send> Drop for Sender<T> { fn drop(&mut self) { - match *unsafe { self.mut_inner() } { + match *unsafe { self.inner_mut() } { Oneshot(ref mut p) => unsafe { (*p.get()).drop_chan(); }, Stream(ref mut p) => unsafe { (*p.get()).drop_chan(); }, Shared(ref mut p) => unsafe { (*p.get()).drop_chan(); }, @@ -895,8 +895,8 @@ impl<T: Send> Receiver<T> { } }; unsafe { - mem::swap(self.mut_inner(), - new_port.mut_inner()); + mem::swap(self.inner_mut(), + new_port.inner_mut()); } } } @@ -943,7 +943,7 @@ impl<T: Send> Receiver<T> { Sync(ref p) => return unsafe { (*p.get()).recv() } }; unsafe { - mem::swap(self.mut_inner(), new_port.mut_inner()); + mem::swap(self.inner_mut(), new_port.inner_mut()); } } } @@ -980,8 +980,8 @@ impl<T: Send> select::Packet for Receiver<T> { } }; unsafe { - mem::swap(self.mut_inner(), - new_port.mut_inner()); + mem::swap(self.inner_mut(), + new_port.inner_mut()); } } } @@ -1012,8 +1012,8 @@ impl<T: Send> select::Packet for Receiver<T> { }; task = t; unsafe { - mem::swap(self.mut_inner(), - new_port.mut_inner()); + mem::swap(self.inner_mut(), + new_port.inner_mut()); } } } @@ -1036,8 +1036,8 @@ impl<T: Send> select::Packet for Receiver<T> { let new_port = match result { Ok(b) => return b, Err(p) => p }; was_upgrade = true; unsafe { - mem::swap(self.mut_inner(), - new_port.mut_inner()); + mem::swap(self.inner_mut(), + new_port.inner_mut()); } } } @@ -1051,7 +1051,7 @@ impl<'a, T: Send> Iterator<T> for Messages<'a, T> { #[unsafe_destructor] impl<T: Send> Drop for Receiver<T> { fn drop(&mut self) { - match *unsafe { self.mut_inner() } { + match *unsafe { self.inner_mut() } { Oneshot(ref mut p) => unsafe { (*p.get()).drop_port(); }, Stream(ref mut p) => unsafe { (*p.get()).drop_port(); }, Shared(ref mut p) => unsafe { (*p.get()).drop_port(); }, |
