auto merge of #6703 : sanxiyn/rust/allocation-lint, r=sanxiyn

Fix #6145. In particular, handle operator overloading.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/libstd/io.rs b/src/libstd/io.rs
index 4ce4ea108e5..5cbadaf2df6 100644
--- a/src/libstd/io.rs
+++ b/src/libstd/io.rs
@@ -1711,9 +1711,9 @@ pub fn read_whole_file_str(file: &Path) -> Result<~str, ~str> {
     result::chain(read_whole_file(file), |bytes| {
         if str::is_utf8(bytes) {
             result::Ok(str::from_bytes(bytes))
-       } else {
-           result::Err(file.to_str() + ~" is not UTF-8")
-       }
+        } else {
+            result::Err(file.to_str() + " is not UTF-8")
+        }
     })
 }
 
diff --git a/src/libstd/to_str.rs b/src/libstd/to_str.rs
index 1469471b7ce..9ca54066289 100644
--- a/src/libstd/to_str.rs
+++ b/src/libstd/to_str.rs
@@ -46,7 +46,7 @@ impl<A:ToStr> ToStr for (A,) {
     fn to_str(&self) -> ~str {
         match *self {
             (ref a,) => {
-                ~"(" + a.to_str() + ~", " + ~")"
+                ~"(" + a.to_str() + ",)"
             }
         }
     }
@@ -97,7 +97,7 @@ impl<A:ToStr,B:ToStr> ToStr for (A, B) {
         //let &(ref a, ref b) = self;
         match *self {
             (ref a, ref b) => {
-                ~"(" + a.to_str() + ~", " + b.to_str() + ~")"
+                ~"(" + a.to_str() + ", " + b.to_str() + ")"
             }
         }
     }