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

2016-01-29 20:19:39 +05:30 · 2016-01-29 20:19:39 +05:30 · 97549c4f16
commit 97549c4f16
parent 669494bcd6 77cdeb0437
1 changed files with 1 additions and 1 deletions
--- 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