about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-08-11 17:52:40 -0700
committerBrian Anderson <banderson@mozilla.com>2011-08-12 12:08:27 -0700
commit09cc957030fd8727da8ec3e51d42e7fa12f11633 (patch)
tree3699995c45b0b26d4ab7ab28ed79293cbe4cc8ec
parent1e397eee2a3218c02368d3e9df9d46d5ac403431 (diff)
downloadrust-09cc957030fd8727da8ec3e51d42e7fa12f11633.tar.gz
rust-09cc957030fd8727da8ec3e51d42e7fa12f11633.zip
Convert str::concat to ivecs
-rw-r--r--src/lib/str.rs2
-rw-r--r--src/test/stdtest/str.rs8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/str.rs b/src/lib/str.rs
index eddc6723a13..70875dca169 100644
--- a/src/lib/str.rs
+++ b/src/lib/str.rs
@@ -449,7 +449,7 @@ fn split(s: str, sep: u8) -> [str] {
     ret v;
 }
 
-fn concat(v: vec[str]) -> str {
+fn concat(v: &[str]) -> str {
     let s: str = "";
     for ss: str  in v { s += ss; }
     ret s;
diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs
index 0a27f3b4311..5acf99e9eaf 100644
--- a/src/test/stdtest/str.rs
+++ b/src/test/stdtest/str.rs
@@ -69,11 +69,11 @@ fn test_substr() {
 
 #[test]
 fn test_concat() {
-    fn t(v: &vec[str], s: &str) { assert (str::eq(str::concat(v), s)); }
-    t(["you", "know", "I'm", "no", "good"], "youknowI'mnogood");
-    let v: vec[str] = [];
+    fn t(v: &[str], s: &str) { assert (str::eq(str::concat(v), s)); }
+    t(~["you", "know", "I'm", "no", "good"], "youknowI'mnogood");
+    let v: [str] = ~[];
     t(v, "");
-    t(["hi"], "hi");
+    t(~["hi"], "hi");
 }
 
 #[test]