user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fallout from renaming

Browse source
This commit is contained in:
Aaron Turon 2014-09-14 20:27:36 -07:00
parent d8dfe1957b
commit fc525eeb4e
210 changed files with 793 additions and 782 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libsync/comm/mod.rs
View file

@ -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(); },