diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-02-14 08:42:23 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-14 10:59:22 -0800 |
| commit | 2f8dbf210215039f39a80424d9c43f96ff79dad4 (patch) | |
| tree | 432e422f227de31cbe6829d8969942782b2f029b | |
| parent | 909fd0d8295febed039db39b7efefcb2e5d0b909 (diff) | |
| download | rust-2f8dbf210215039f39a80424d9c43f96ff79dad4.tar.gz rust-2f8dbf210215039f39a80424d9c43f96ff79dad4.zip | |
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
| -rw-r--r-- | src/librustuv/idle.rs | 5 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-8727.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/issue-8860.rs | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/librustuv/idle.rs b/src/librustuv/idle.rs index 30e02b168ca..46de70c1746 100644 --- a/src/librustuv/idle.rs +++ b/src/librustuv/idle.rs @@ -117,7 +117,10 @@ mod test { match *slot.get() { (ref mut task, ref mut val) => { *val = n; - task.take_unwrap() + match task.take() { + Some(t) => t, + None => return + } } } } diff --git a/src/test/compile-fail/issue-8727.rs b/src/test/compile-fail/issue-8727.rs index 7088c4df6b7..003f1d67cdb 100644 --- a/src/test/compile-fail/issue-8727.rs +++ b/src/test/compile-fail/issue-8727.rs @@ -14,7 +14,11 @@ struct Data(~Option<Data>); -fn generic<T>( _ : ~[(Data,T)] ) {let rec : ~[(Data,(bool,T))] = ~[]; generic( rec ); } //~ ERROR overly deep expansion of inlined function +fn generic<T>( _ : ~[(Data,T)] ) { + //~^ ERROR overly deep expansion of inlined function + let rec : ~[(Data,(bool,T))] = ~[]; + generic( rec ); +} fn main () { diff --git a/src/test/run-pass/issue-8860.rs b/src/test/run-pass/issue-8860.rs index e7d2a273939..230dce16151 100644 --- a/src/test/run-pass/issue-8860.rs +++ b/src/test/run-pass/issue-8860.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-fast + extern mod green; static mut DROP: int = 0i; |