auto merge of #9404 : blake2-ppc/rust/result-map-opt, r=cmr

std::result: Remove function `map_opt`.

This function has never had any users in the tree, so this is my
initiative to remove this function.

1 files changed, 0 insertions, 13 deletions

diff --git a/src/libstd/result.rs b/src/libstd/result.rs
index 3811f34cec4..a1980aa70e3 100644
--- a/src/libstd/result.rs
+++ b/src/libstd/result.rs
@@ -366,19 +366,6 @@ impl<T, E> either::AsEither<E, T> for Result<T, E> {
     }
 }
 
-#[inline]
-#[allow(missing_doc)]
-pub fn map_opt<T, U: ToStr, V>(o_t: &Option<T>,
-                               op: &fn(&T) -> Result<V,U>) -> Result<Option<V>,U> {
-    match *o_t {
-        None => Ok(None),
-        Some(ref t) => match op(t) {
-            Ok(v) => Ok(Some(v)),
-            Err(e) => Err(e)
-        }
-    }
-}
-
 /// Takes each element in the iterator: if it is an error, no further
 /// elements are taken, and the error is returned.
 /// Should no error occur, a vector containing the values of each Result