rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

core: change notify_chan eq checks to is_none(), instead

Browse Source
This commit is contained in:
Jeff Olson
2012-09-05 15:39:51 -07:00
committed by Brian Anderson
parent 02ddbadc10
commit 2ed00ff928
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcore/task.rs
View File

@@ -246,14 +246,13 @@ fn task() -> TaskBuilder {
mut consumed: false, mut consumed: false,
}) })
} }
priv impl TaskBuilder { priv impl TaskBuilder {
fn consume() -> TaskBuilder { fn consume() -> TaskBuilder {
if self.consumed { if self.consumed {
fail ~"Cannot copy a task_builder"; // Fake move mode on self fail ~"Cannot copy a task_builder"; // Fake move mode on self
} }
self.consumed = true; self.consumed = true;
let notify_chan = if self.opts.notify_chan == None { let notify_chan = if self.opts.notify_chan.is_none() {
None None
} else { } else {
Some(option::swap_unwrap(&mut self.opts.notify_chan)) Some(option::swap_unwrap(&mut self.opts.notify_chan))
@@ -278,7 +277,7 @@ impl TaskBuilder {
* the other will not be killed. * the other will not be killed.
*/ */
fn unlinked() -> TaskBuilder { fn unlinked() -> TaskBuilder {
let notify_chan = if self.opts.notify_chan == None { let notify_chan = if self.opts.notify_chan.is_none() {
None None
} else { } else {
Some(option::swap_unwrap(&mut self.opts.notify_chan)) Some(option::swap_unwrap(&mut self.opts.notify_chan))
@@ -300,7 +299,7 @@ impl TaskBuilder {
* the child. * the child.
*/ */
fn supervised() -> TaskBuilder { fn supervised() -> TaskBuilder {
let notify_chan = if self.opts.notify_chan == None { let notify_chan = if self.opts.notify_chan.is_none() {
None None
} else { } else {
Some(option::swap_unwrap(&mut self.opts.notify_chan)) Some(option::swap_unwrap(&mut self.opts.notify_chan))
@@ -321,7 +320,7 @@ impl TaskBuilder {
* other will be killed. * other will be killed.
*/ */
fn linked() -> TaskBuilder { fn linked() -> TaskBuilder {
let notify_chan = if self.opts.notify_chan == None { let notify_chan = if self.opts.notify_chan.is_none() {
None None
} else { } else {
Some(option::swap_unwrap(&mut self.opts.notify_chan)) Some(option::swap_unwrap(&mut self.opts.notify_chan))
@@ -388,7 +387,7 @@ impl TaskBuilder {
} }
/// Configure a custom scheduler mode for the task. /// Configure a custom scheduler mode for the task.
fn sched_mode(mode: SchedMode) -> TaskBuilder { fn sched_mode(mode: SchedMode) -> TaskBuilder {
let notify_chan = if self.opts.notify_chan == None { let notify_chan = if self.opts.notify_chan.is_none() {
None None
} else { } else {
Some(option::swap_unwrap(&mut self.opts.notify_chan)) Some(option::swap_unwrap(&mut self.opts.notify_chan))
@@ -419,7 +418,7 @@ impl TaskBuilder {
*/ */
fn add_wrapper(wrapper: fn@(+fn~()) -> fn~()) -> TaskBuilder { fn add_wrapper(wrapper: fn@(+fn~()) -> fn~()) -> TaskBuilder {
let prev_gen_body = self.gen_body; let prev_gen_body = self.gen_body;
let notify_chan = if self.opts.notify_chan == None { let notify_chan = if self.opts.notify_chan.is_none() {
None None
} else { } else {
Some(option::swap_unwrap(&mut self.opts.notify_chan)) Some(option::swap_unwrap(&mut self.opts.notify_chan))
@@ -450,7 +449,7 @@ impl TaskBuilder {
* must be greater than zero. * must be greater than zero.
*/ */
fn spawn(+f: fn~()) { fn spawn(+f: fn~()) {
let notify_chan = if self.opts.notify_chan == None { let notify_chan = if self.opts.notify_chan.is_none() {
None None
} else { } else {
let swapped_notify_chan = let swapped_notify_chan =
@@ -1267,7 +1266,7 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) {
}; };
assert !new_task.is_null(); assert !new_task.is_null();
// Getting killed after here would leak the task. // Getting killed after here would leak the task.
let mut notify_chan = if opts.notify_chan == None { let mut notify_chan = if opts.notify_chan.is_none() {
None None
} else { } else {
Some(option::swap_unwrap(&mut opts.notify_chan)) Some(option::swap_unwrap(&mut opts.notify_chan))