auto merge of #5145 : Kimundi/rust/incoming, r=catamorphism

Author: bors

src/libcore/to_str.rs

@@ -74,10 +74,53 @@ impl<A:ToStr,B:ToStr,C:ToStr> ToStr for (A, B, C) {
     }
 }
 
+impl<A:ToStr> ToStr for &[A] {
+    #[inline(always)]
+    pure fn to_str(&self) -> ~str {
+        unsafe {
+            // FIXME #4568
+            // Bleh -- not really unsafe
+            // push_str and push_char
+            let mut acc = ~"[", first = true;
+            for self.each |elt| {
+                unsafe {
+                    if first { first = false; }
+                    else { str::push_str(&mut acc, ~", "); }
+                    str::push_str(&mut acc, elt.to_str());
+                }
+            }
+            str::push_char(&mut acc, ']');
+            acc
+        }
+    }
+}
+
 impl<A:ToStr> ToStr for ~[A] {
     #[inline(always)]
     pure fn to_str(&self) -> ~str {
         unsafe {
+            // FIXME #4568
+            // Bleh -- not really unsafe
+            // push_str and push_char
+            let mut acc = ~"[", first = true;
+            for self.each |elt| {
+                unsafe {
+                    if first { first = false; }
+                    else { str::push_str(&mut acc, ~", "); }
+                    str::push_str(&mut acc, elt.to_str());
+                }
+            }
+            str::push_char(&mut acc, ']');
+            acc
+        }
+    }
+}
+
+impl<A:ToStr> ToStr for @[A] {
+    #[inline(always)]
+    pure fn to_str(&self) -> ~str {
+        unsafe {
+            // FIXME #4568
             // Bleh -- not really unsafe
             // push_str and push_char
             let mut acc = ~"[", first = true;

src/test/run-pass/vec-to_str.rs

@@ -0,0 +1,24 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub fn main() {
+    assert (~[0, 1]).to_str() == ~"[0, 1]";
+    assert (&[1, 2]).to_str() == ~"[1, 2]";
+    assert (@[2, 3]).to_str() == ~"[2, 3]";
+
+    let foo = ~[3, 4];
+    let bar = &[4, 5];
+    let baz = @[5, 6];
+
+    assert foo.to_str() == ~"[3, 4]";
+    assert bar.to_str() == ~"[4, 5]";
+    assert baz.to_str() == ~"[5, 6]";
+
+}