bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge remote-tracking branch 'brson/io'

Browse source 
Conflicts:
	src/libstd/rt/comm.rs
	src/libstd/rt/mod.rs
	src/libstd/rt/sched.rs
	src/libstd/rt/task.rs
	src/libstd/rt/test.rs
	src/libstd/rt/tube.rs
	src/libstd/rt/uv/uvio.rs
	src/libstd/rt/uvio.rs
	src/libstd/task/spawn.rs
This commit is contained in:
Brian Anderson 2013-06-16 02:03:37 -07:00
commit 319cf6e465
27 changed files with 2894 additions and 799 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -520,20 +520,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;
}
}
}