about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2016-01-29 20:19:39 +0530
committerManish Goregaokar <manishsmail@gmail.com>2016-01-29 20:19:39 +0530
commit97549c4f1608a12c6571bef16c4c82899df9d69f (patch)
tree5adc8593ed2229793cea3d8962e5a5b378b3e5cb
parent669494bcd622999d06ae4465028d59035602eb0d (diff)
parent77cdeb043766502618891be1973e9d70be29ffe3 (diff)
downloadrust-97549c4f1608a12c6571bef16c4c82899df9d69f.tar.gz
rust-97549c4f1608a12c6571bef16c4c82899df9d69f.zip
Rollup merge of #31272 - errandir:master, r=steveklabnik
-rw-r--r--src/libcollections/string.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs
index d9cbc4488fc..97c12043e76 100644
--- 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