auto merge of #16579 : steveklabnik/rust/gh9099, r=pcwalton

bors · bors · commit fb4201ff34f4 · 2014-08-18T22:46:19.000Z
Fixes #9099
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
@@ -244,7 +244,7 @@ impl<T> Option<T> {
         }
     }
 
-    /// Moves a value out of an option type and returns it, consuming the `Option`.
+    /// Returns the inner `T` of a `Some(T)`.
     ///
     /// # Failure
     ///

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ impl<T> Option<T> {`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`247`		- /// Moves a value out of an option type and returns it, consuming the `Option`.
	`247`	+ /// Returns the inner `T` of a `Some(T)`.
`248`	`248`	`///`
`249`	`249`	`/// # Failure`
`250`	`250`	`///`