Skip to content

Commit

Permalink
Test fixes from the rollup
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
alexcrichton committed Apr 16, 2014
1 parent 0754d1d commit c18c928
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/libgreen/sched.rs
Expand Up @@ -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!()
Expand Down
2 changes: 1 addition & 1 deletion src/librustuv/lib.rs
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/test/run-pass/smallest-hello-world.rs
Expand Up @@ -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]

Expand Down

5 comments on commit c18c928

@bors
Copy link
Contributor

@bors bors commented on c18c928 Apr 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at alexcrichton@c18c928

@bors
Copy link
Contributor

@bors bors commented on c18c928 Apr 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/rollup = c18c928 into auto

@bors
Copy link
Contributor

@bors bors commented on c18c928 Apr 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/rollup = c18c928 merged ok, testing candidate = 349d66a

@bors
Copy link
Contributor

@bors bors commented on c18c928 Apr 16, 2014

@bors
Copy link
Contributor

@bors bors commented on c18c928 Apr 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 349d66a

Please sign in to comment.