---

thestinger · thestinger · commit f5b3486681b4 · 2013-01-13T01:38:20.000-05:00
yaml --- r: 34543 b: refs/heads/snap-stage3 c: 3c6da77 h: refs/heads/master i: 34541: 66d16b0 34539: 4b94fcc 34535: c2a19b9 34527: 6b6afa1 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 65a0125f7f2e016a066bb3e8944b6ec31d2d46c7
+refs/heads/snap-stage3: 3c6da7761bf74c54c1d56ba85f4ef55004abcb0a
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libcore/option.rs b/branches/snap-stage3/src/libcore/option.rs
@@ -114,7 +114,7 @@ pub pure fn map_consume<T, U>(opt: Option<T>,
      * As `map`, but consumes the option and gives `f` ownership to avoid
      * copying.
      */
-    if opt.is_some() { Some(f(option::unwrap(move opt))) } else { None }
+    match opt { None => None, Some(v) => Some(f(v)) }
 }
 
 pub pure fn chain<T, U>(opt: Option<T>,

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ pub pure fn map_consume<T, U>(opt: Option<T>,`
`114`	`114`	* As `map`, but consumes the option and gives `f` ownership to avoid
`115`	`115`	`* copying.`
`116`	`116`	`*/`
`117`		`- if opt.is_some() { Some(f(option::unwrap(move opt))) } else { None }`
	`117`	`+ match opt { None => None, Some(v) => Some(f(v)) }`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`pub pure fn chain<T, U>(opt: Option<T>,`