Rollup merge of #31272 - errandir:master, r=steveklabnik

Manishearth · Manishearth · commit 97549c4f1608 · 2016-01-29T20:19:39.000+05:30
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs
@@ -641,7 +641,7 @@ impl String {
         Cow::Owned(res)
     }
 
-    /// Decode a UTF-16 encoded vector `v` into a `String`, returning `None`
+    /// Decode a UTF-16 encoded vector `v` into a `String`, returning `Err`
     /// if `v` contains any invalid data.
     ///
     /// # Examples

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ impl String {`
`641`	`641`	`Cow::Owned(res)`
`642`	`642`	`}`
`643`	`643`
`644`		- /// Decode a UTF-16 encoded vector `v` into a `String`, returning `None`
	`644`	+ /// Decode a UTF-16 encoded vector `v` into a `String`, returning `Err`
`645`	`645`	/// if `v` contains any invalid data.
`646`	`646`	`///`
`647`	`647`	`/// # Examples`