auto merge of #14667 : aochagavia/rust/pr2, r=huonw

Author: bors

src/compiletest/errors.rs

@@ -31,7 +31,7 @@ pub fn load_errors(re: &Regex, testfile: &Path) -> Vec<ExpectedError> {
 fn parse_expected(line_num: uint, line: &str, re: &Regex) -> Option<ExpectedError> {
     re.captures(line).and_then(|caps| {
         let adjusts = caps.name("adjusts").len();
-        let kind = caps.name("kind").to_ascii().to_lower().into_str().to_string();
+        let kind = caps.name("kind").to_ascii().to_lower().into_str();
         let msg = caps.name("msg").trim().to_string();
 
         debug!("line={} kind={} msg={}", line_num, kind, msg);

src/compiletest/util.rs

@@ -41,7 +41,7 @@ pub fn make_new_path(path: &str) -> String {
       Some(curr) => {
         format!("{}{}{}", path, path_div(), curr)
       }
-      None => path.to_str().to_string()
+      None => path.to_str()
     }
 }
 

src/doc/complement-cheatsheet.md

@@ -8,7 +8,7 @@ Use [`ToStr`](std/to_str/trait.ToStr.html).
 
 ~~~
 let x: int = 42;
-let y: String = x.to_str().to_string();
+let y: String = x.to_str();
 ~~~
 
 **String to int**

src/doc/guide-tasks.md

@@ -467,7 +467,7 @@ fn stringifier(channel: &sync::DuplexStream<String, uint>) {
     let mut value: uint;
     loop {
         value = channel.recv();
-        channel.send(value.to_str().to_string());
+        channel.send(value.to_str());
         if value == 0 { break; }
     }
 }
@@ -492,7 +492,7 @@ extern crate sync;
 #     let mut value: uint;
 #     loop {
 #         value = channel.recv();
-#         channel.send(value.to_str().to_string());
+#         channel.send(value.to_str());
 #         if value == 0u { break; }
 #     }
 # }

src/doc/rust.md

@@ -3579,7 +3579,7 @@ trait Printable {
 }
 
 impl Printable for int {
-  fn to_string(&self) -> String { self.to_str().to_string() }
+  fn to_string(&self) -> String { self.to_str() }
 }
 
 fn print(a: Box<Printable>) {

src/libgetopts/lib.rs

@@ -222,7 +222,7 @@ impl Name {
 
     fn to_str(&self) -> String {
         match *self {
-            Short(ch) => ch.to_str().to_string(),
+            Short(ch) => ch.to_str(),
             Long(ref s) => s.to_string()
         }
     }

src/libnum/complex.rs

@@ -349,7 +349,7 @@ mod test {
     #[test]
     fn test_to_str() {
         fn test(c : Complex64, s: String) {
-            assert_eq!(c.to_str().to_string(), s);
+            assert_eq!(c.to_str(), s);
         }
         test(_0_0i, "0+0i".to_string());
         test(_1_0i, "1+0i".to_string());

src/libnum/rational.rs

@@ -559,7 +559,7 @@ mod test {
     fn test_to_from_str() {
         fn test(r: Rational, s: String) {
             assert_eq!(FromStr::from_str(s.as_slice()), Some(r));
-            assert_eq!(r.to_str().to_string(), s);
+            assert_eq!(r.to_str(), s);
         }
         test(_1, "1/1".to_string());
         test(_0, "0/1".to_string());

src/libregex_macros/lib.rs

@@ -620,7 +620,7 @@ fn parse(cx: &mut ExtCtxt, tts: &[ast::TokenTree]) -> Option<String> {
     let regex = match entry.node {
         ast::ExprLit(lit) => {
             match lit.node {
-                ast::LitStr(ref s, _) => s.to_str().to_string(),
+                ast::LitStr(ref s, _) => s.to_str(),
                 _ => {
                     cx.span_err(entry.span, format!(
                         "expected string literal but got `{}`",

src/librustc/driver/driver.rs

@@ -533,15 +533,15 @@ impl pprust::PpAnn for IdentifiedAnnotation {
         match node {
             pprust::NodeItem(item) => {
                 try!(pp::space(&mut s.s));
-                s.synth_comment(item.id.to_str().to_string())
+                s.synth_comment(item.id.to_str())
             }
             pprust::NodeBlock(blk) => {
                 try!(pp::space(&mut s.s));
                 s.synth_comment((format!("block {}", blk.id)).to_string())
             }
             pprust::NodeExpr(expr) => {
                 try!(pp::space(&mut s.s));
-                try!(s.synth_comment(expr.id.to_str().to_string()));
+                try!(s.synth_comment(expr.id.to_str()));
                 s.pclose()
             }
             pprust::NodePat(pat) => {