about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorSean McArthur <sean.monstar@gmail.com>2016-07-14 12:17:39 -0700
committerSean McArthur <sean.monstar@gmail.com>2016-07-20 15:54:54 -0700
commitfbfee42a2f65b7a3d4acd0d9d029bb75208ac800 (patch)
treecc5552f677c31f1d5981dc05cb5bbbaf662451ed /src/libcore
parentfe5c439f695fd72b7be0d0f28ee8397b3256630c (diff)
downloadrust-fbfee42a2f65b7a3d4acd0d9d029bb75208ac800.tar.gz
rust-fbfee42a2f65b7a3d4acd0d9d029bb75208ac800.zip
core: impl From<T> for Option<T>
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/option.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 045c1f9feaf..fe508adb713 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -142,6 +142,7 @@
 use self::Option::*;
 
 use clone::Clone;
+use convert::From;
 use default::Default;
 use iter::ExactSizeIterator;
 use iter::{Iterator, DoubleEndedIterator, FromIterator, IntoIterator};
@@ -754,6 +755,13 @@ impl<'a, T> IntoIterator for &'a mut Option<T> {
     }
 }
 
+#[stable(since = "1.12.0", feature = "option_from")]
+impl<T> From<T> for Option<T> {
+    fn from(val: T) -> Option<T> {
+        Some(val)
+    }
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // The Option Iterators
 /////////////////////////////////////////////////////////////////////////////