about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-11-21 04:22:15 +0000
committerbors <bors@rust-lang.org>2015-11-21 04:22:15 +0000
commitef5ee7d895f227c3b5dfbc1b57509136957b871a (patch)
tree21ccb34452fe73d20bb5d901954500e10f3e7f36 /src
parentd1c7a93eff5bd27632130cc5bcdaac54c32bca08 (diff)
parentda5dd298d4380cf5e96acb26eaf5977c124ce873 (diff)
downloadrust-ef5ee7d895f227c3b5dfbc1b57509136957b871a.tar.gz
rust-ef5ee7d895f227c3b5dfbc1b57509136957b871a.zip
Auto merge of #29948 - devonhollowood:fromstr-parse, r=steveklabnik
Implement #29919
Diffstat (limited to 'src')
-rw-r--r--src/libcore/str/mod.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index f82b9d79d5c..c246b310543 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -37,6 +37,13 @@ pub mod pattern;
 
 /// A trait to abstract the idea of creating a new instance of a type from a
 /// string.
+///
+/// `FromStr`'s [`from_str()`] method is often used implicitly, through
+/// [`str`]'s [`parse()`] method. See [`parse()`]'s documentation for examples.
+///
+/// [`from_str()`]: #tymethod.from_str
+/// [`str`]: ../primitive.str.html
+/// [`parse()`]: ../primitive.str.html#method.parse
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait FromStr: Sized {
     /// The associated error which can be returned from parsing.