diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-04-15 08:32:35 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-04-15 22:54:07 -0700 |
| commit | c18c9284b352f3605553343cd78c7a8eb75b5cd2 (patch) | |
| tree | a752ef412371e7668d1137b65c4fe8a6f118f426 | |
| parent | 0754d1d061761a5f9e7fc13d45579953d329cfe1 (diff) | |
Test fixes from the rollup
Closes #13546 (workcache: Don't assume gcc exists on all platforms) Closes #13545 (std: Remove pub use globs) Closes #13530 (test: Un-ignore smallest-hello-world.rs) Closes #13529 (std: Un-ignore some float tests on windows) Closes #13528 (green: Add a helper macro for booting libgreen) Closes #13526 (Remove RUST_LOG="::help" from the docs) Closes #13524 (dist: Make Windows installer uninstall first. Closes #9563) Closes #13521 (Change AUTHORS section in the man pages) Closes #13519 (Update GitHub's Rust projects page.) Closes #13518 (mk: Change windows to install from stage2) Closes #13516 (liburl doc: insert missing hyphen) Closes #13514 (rustdoc: Better sorting criteria for searching.) Closes #13512 (native: Fix a race in select()) Closes #13506 (Use the unsigned integer types for bitwise intrinsics.) Closes #13502 (Add a default impl for Set::is_superset)
| -rw-r--r-- | src/libgreen/sched.rs | 4 | ||||
| -rw-r--r-- | src/librustuv/lib.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/smallest-hello-world.rs | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/libgreen/sched.rs b/src/libgreen/sched.rs index e214797d4f8..dd9df8063f0 100644 --- a/src/libgreen/sched.rs +++ b/src/libgreen/sched.rs @@ -1035,10 +1035,10 @@ mod test { fn sched_id() -> uint { let mut task = Local::borrow(None::<Task>); - match task.get().maybe_take_runtime::<GreenTask>() { + match task.maybe_take_runtime::<GreenTask>() { Some(green) => { let ret = green.sched.get_ref().sched_id(); - task.get().put_runtime(green); + task.put_runtime(green); return ret; } None => fail!() diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs index 8f5d4a72514..4f2b7103b79 100644 --- a/src/librustuv/lib.rs +++ b/src/librustuv/lib.rs @@ -462,7 +462,7 @@ fn local_loop() -> &'static mut uvio::UvIoFactory { unsafe { cast::transmute({ let mut task = Local::borrow(None::<Task>); - let mut io = task.get().local_io().unwrap(); + let mut io = task.local_io().unwrap(); let (_vtable, uvio): (uint, &'static mut uvio::UvIoFactory) = cast::transmute(io.get()); uvio diff --git a/src/test/run-pass/smallest-hello-world.rs b/src/test/run-pass/smallest-hello-world.rs index 0ec1ec79a60..65288cf0416 100644 --- a/src/test/run-pass/smallest-hello-world.rs +++ b/src/test/run-pass/smallest-hello-world.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// Smallest hello world with no runtime +// ignore-android + +// Smallest "hello world" with a libc runtime #![no_std] |