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

Auto merge of #26696 - steveklabnik:rollup, r=steveklabnik

Browse source 
- Successful merges: #26373, #26506, #26580, #26622, #26627, #26651, #26678, #26692
- Failed merges:
This commit is contained in:
bors 2015-06-30 23:46:57 +00:00
commit bf3c979ec3
10 changed files with 361 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/compile-fail/no-send-res-ports.rs
View file

@ -20,7 +20,7 @@ fn main() {
_x: Port<()>,
}
impl Drop for foo {
impl Drop for foo {
fn drop(&mut self) {}
}

4
src/test/run-pass/issue-2718.rs
View file

@ -165,7 +165,7 @@ pub mod pipes {
p: Option<*const packet<T>>,
}
impl<T:Send> Drop for send_packet<T> {
impl<T:Send> Drop for send_packet<T> {
fn drop(&mut self) {
unsafe {
if self.p != None {
@ -194,7 +194,7 @@ pub mod pipes {
p: Option<*const packet<T>>,
}
impl<T:Send> Drop for recv_packet<T> {
impl<T:Send> Drop for recv_packet<T> {
fn drop(&mut self) {
unsafe {
if self.p != None {