rollup merge of rust-lang#23791: jviereck/fix-23713

alexcrichton · alexcrichton · commit 8ec3695a6774 · 2015-03-27T12:44:10.000-07:00
Fixes rust-lang#23713.
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
@@ -333,7 +333,7 @@ impl<T> Option<T> {
         }
     }
 
-    /// Returns the inner `T` of a `Some(T)`.
+    /// Moves the value `v` out of the `Option<T>` if the content of the `Option<T>` is a `Some(v)`.
     ///
     /// # Panics
     ///

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ impl<T> Option<T> {`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
`336`		- /// Returns the inner `T` of a `Some(T)`.
	`336`	+ /// Moves the value `v` out of the `Option<T>` if the content of the `Option<T>` is a `Some(v)`.
`337`	`337`	`///`
`338`	`338`	`/// # Panics`
`339`	`339`	`///`