Auto merge of #24869 - steveklabnik:rollup, r=steveklabnik

- Successful merges: #24797, #24804, #24848, #24854, #24855, #24860, #24863, #24866, #24867, #24868
- Failed merges: 

1 files changed, 1 insertions, 3 deletions

diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index d9cda58d9eb..d3de77a9241 100644
--- a/src/libcore/convert.rs
+++ b/src/libcore/convert.rs
@@ -83,10 +83,8 @@ pub trait Into<T>: Sized {
 /// `String` implements `From<&str>`:
 ///
 /// ```
-/// let s = "hello";
 /// let string = "hello".to_string();
-///
-/// let other_string: String = From::from(s);
+/// let other_string = String::from("hello");
 ///
 /// assert_eq!(string, other_string);
 /// ```