avoid unwrap in Option::map_consume implementation

thestinger · thestinger · commit 3c6da7761bf7 · 2013-01-13T01:38:20.000-05:00
diff --git a/src/libcore/option.rs b/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>,`