about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2013-01-13 01:38:20 -0500
committerDaniel Micay <danielmicay@gmail.com>2013-01-13 01:38:20 -0500
commit3c6da7761bf74c54c1d56ba85f4ef55004abcb0a (patch)
tree15019fab5d96d97de8f31798e675dcecd390338e
parent65a0125f7f2e016a066bb3e8944b6ec31d2d46c7 (diff)
avoid unwrap in Option::map_consume implementation
-rw-r--r--src/libcore/option.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 6a5e90c58ad..3fb2acd3480 100644
--- 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>,