Skip to content

Commit 2f8dbf2

Browse files
committed
Test fixes and rebase conflicts from rollups
PRs closed as part of this: Closes #12212 r=alexcrichton Closes #12215 r=brson Closes #12246 r=pcwalton Closes #12247 r=cmr Closes #12251 r=brson Closes #12255 r=alexcrichton Closes #12257 r=alexcrichton Closes #12258 r=huonw Closes #12259 r=huonw Closes #12263 r=kballard Closes #12269 r=alexcrichton
1 parent 909fd0d commit 2f8dbf2

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

src/librustuv/idle.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ mod test {
117117
match *slot.get() {
118118
(ref mut task, ref mut val) => {
119119
*val = n;
120-
task.take_unwrap()
120+
match task.take() {
121+
Some(t) => t,
122+
None => return
123+
}
121124
}
122125
}
123126
}

src/test/compile-fail/issue-8727.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
struct Data(~Option<Data>);
1616

17-
fn generic<T>( _ : ~[(Data,T)] ) {let rec : ~[(Data,(bool,T))] = ~[]; generic( rec ); } //~ ERROR overly deep expansion of inlined function
17+
fn generic<T>( _ : ~[(Data,T)] ) {
18+
//~^ ERROR overly deep expansion of inlined function
19+
let rec : ~[(Data,(bool,T))] = ~[];
20+
generic( rec );
21+
}
1822

1923

2024
fn main () {

src/test/run-pass/issue-8860.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-fast
12+
1113
extern mod green;
1214

1315
static mut DROP: int = 0i;

0 commit comments

Comments
 (0)