bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Merge remote-tracking branch 'brson/io-wip' into io

Browse source 
Conflicts:
	src/libstd/rt/sched.rs
	src/libstd/rt/task.rs
	src/libstd/rt/test.rs
	src/libstd/task/mod.rs
	src/libstd/task/spawn.rs
This commit is contained in:
Brian Anderson 2013-06-15 19:31:46 -07:00
commit 3208fc36bf
9 changed files with 788 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libstd/task/mod.rs
View file

@ -513,20 +513,9 @@ pub fn failing() -> bool {
}
}
_ => {
let mut unwinding = false;
do Local::borrow::<Task, ()> |local| {
unwinding = match local.unwinder {
Some(unwinder) => {
unwinder.unwinding
}
None => {
// Because there is no unwinder we can't be unwinding.
// (The process will abort on failure)
false
}
}
do Local::borrow::<Task, bool> |local| {
local.unwinder.unwinding
}
return unwinding;
}
}
}