Skip to content

Commit c18c928

Browse files
committed
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)
1 parent 0754d1d commit c18c928

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Diff for: src/libgreen/sched.rs

+2-2
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!()

Diff for: src/librustuv/lib.rs

+1-1
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

Diff for: src/test/run-pass/smallest-hello-world.rs

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

11-
// Smallest hello world with no runtime
11+
// ignore-android
12+
13+
// Smallest "hello world" with a libc runtime
1214

1315
#![no_std]
1416

0 commit comments

Comments
 (0)