about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2016-11-01 16:15:51 +0100
committerGitHub <noreply@github.com>2016-11-01 16:15:51 +0100
commit79d3d26c2e1cc48038cb3137e80b5ef3402c1846 (patch)
tree6d60dff8baf952b76a3646377d618c559885617d /src/libcore
parentac968c466451cb9aafd9e8598ddb396ed0e6fe31 (diff)
parent971e0be77c53a4d97f7b50f59854770b651c7881 (diff)
downloadrust-79d3d26c2e1cc48038cb3137e80b5ef3402c1846.tar.gz
rust-79d3d26c2e1cc48038cb3137e80b5ef3402c1846.zip
Rollup merge of #36849 - diwic:69-fromutf8-doc, r=alexcrichton
str: Fix documentation typo

from_utf8 returns a Result, not an Option.

Signed-off-by: David Henningsson diwic@ubuntu.com
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/str/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index d63d2d64fe1..196750254af 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -132,7 +132,7 @@ impl Utf8Error {
     /// verified.
     ///
     /// It is the maximum index such that `from_utf8(input[..index])`
-    /// would return `Some(_)`.
+    /// would return `Ok(_)`.
     ///
     /// # Examples
     ///