Skip to content

Commit 6571fb0

Browse files
committed
Test fixes from the rollup
Closes rust-lang#13546 (workcache: Don't assume gcc exists on all platforms) Closes rust-lang#13545 (std: Remove pub use globs) Closes rust-lang#13530 (test: Un-ignore smallest-hello-world.rs) Closes rust-lang#13529 (std: Un-ignore some float tests on windows) Closes rust-lang#13528 (green: Add a helper macro for booting libgreen) Closes rust-lang#13526 (Remove RUST_LOG="::help" from the docs) Closes rust-lang#13524 (dist: Make Windows installer uninstall first. Closes rust-lang#9563) Closes rust-lang#13521 (Change AUTHORS section in the man pages) Closes rust-lang#13519 (Update GitHub's Rust projects page.) Closes rust-lang#13518 (mk: Change windows to install from stage2) Closes rust-lang#13516 (liburl doc: insert missing hyphen) Closes rust-lang#13514 (rustdoc: Better sorting criteria for searching.) Closes rust-lang#13512 (native: Fix a race in select()) Closes rust-lang#13506 (Use the unsigned integer types for bitwise intrinsics.) Closes rust-lang#13502 (Add a default impl for Set::is_superset)
1 parent 0754d1d commit 6571fb0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/libgreen/sched.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,10 +1035,10 @@ mod test {
10351035

10361036
fn sched_id() -> uint {
10371037
let mut task = Local::borrow(None::<Task>);
1038-
match task.get().maybe_take_runtime::<GreenTask>() {
1038+
match task.maybe_take_runtime::<GreenTask>() {
10391039
Some(green) => {
10401040
let ret = green.sched.get_ref().sched_id();
1041-
task.get().put_runtime(green);
1041+
task.put_runtime(green);
10421042
return ret;
10431043
}
10441044
None => fail!()

src/librustuv/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ fn local_loop() -> &'static mut uvio::UvIoFactory {
462462
unsafe {
463463
cast::transmute({
464464
let mut task = Local::borrow(None::<Task>);
465-
let mut io = task.get().local_io().unwrap();
465+
let mut io = task.local_io().unwrap();
466466
let (_vtable, uvio): (uint, &'static mut uvio::UvIoFactory) =
467467
cast::transmute(io.get());
468468
uvio

0 commit comments

Comments
 (0)