---

olsonjeffery · brson · commit 222258ded803 · 2012-09-08T14:22:15.000-07:00
yaml --- r: 30415 b: refs/heads/incoming c: a8fc771 h: refs/heads/master i: 30413: f9c1e2f 30411: 9aa36ad 30407: a6a47e5 30399: b1a2a14 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 70e5a19ebffb29a124a4b4c5513cf5d654d3634a
+refs/heads/incoming: a8fc771f2004c376bbde68d09ead45d679f8f597
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/task.rs b/branches/incoming/src/libcore/task.rs
@@ -254,7 +254,7 @@ priv impl TaskBuilder {
         }
         self.consumed = true;
         let notify_chan = if self.opts.notify_chan == None {
-            None
+            none
         } else {
             Some(option::swap_unwrap(&mut self.opts.notify_chan))
         };

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ priv impl TaskBuilder {`
`254`	`254`	`}`
`255`	`255`	`self.consumed = true;`
`256`	`256`	`let notify_chan = if self.opts.notify_chan == None {`
`257`		`- None`
	`257`	`+ none`
`258`	`258`	`} else {`
`259`	`259`	`Some(option::swap_unwrap(&mut self.opts.notify_chan))`
`260`	`260`	`};`