Merge branch 'master' of git://github.com/graydon/rust

6 files changed, 36 insertions, 20 deletions

diff --git a/src/test/bench/99-bottles/99bob-iter.rs b/src/test/bench/99-bottles/99bob-iter.rs
index 336939c8..09638941 100644
--- a/src/test/bench/99-bottles/99bob-iter.rs
+++ b/src/test/bench/99-bottles/99bob-iter.rs
@@ -40,7 +40,7 @@ case (1) {
       b += ns;
     }
     else {
-      b += t.(i);
+      _str.push_byte(b, t.(i));
     }
     i += 1u;
   }
diff --git a/src/test/bench/99-bottles/99bob-simple.rs b/src/test/bench/99-bottles/99bob-simple.rs
index 10fec27a..3c426f51 100644
--- a/src/test/bench/99-bottles/99bob-simple.rs
+++ b/src/test/bench/99-bottles/99bob-simple.rs
@@ -39,7 +39,7 @@ case (1) {
       b += ns;
     }
     else {
-      b += t.(i);
+      _str.push_byte(b, t.(i));
     }
     i += 1u;
   }
diff --git a/src/test/bench/shootout/fasta.rs b/src/test/bench/shootout/fasta.rs
index ffec6db9..f88f4330 100644
--- a/src/test/bench/shootout/fasta.rs
+++ b/src/test/bench/shootout/fasta.rs
@@ -28,7 +28,7 @@ fn make_cumulative(vec[aminoacids] aa) -> vec[aminoacids] {
   let vec[aminoacids] ans = vec();
   for (aminoacids a in aa) {
     cp += a._1;
-    ans += tup(a._0, cp);
+    ans += vec(tup(a._0, cp));
   }
   ret ans;
 }
@@ -59,7 +59,7 @@ fn make_random_fasta(str id, str desc, vec[aminoacids] genelist, int n) {
   auto rng = myrandom(std.rand.mk_rng().next());
   let str op = "";
   for each (uint i in _uint.range(0u, n as uint)) {
-    op += select_random(rng.next(100u32), genelist) as u8;
+    _str.push_byte(op, select_random(rng.next(100u32), genelist) as u8);
     if (_str.byte_len(op) >= LINE_LENGTH()) {
       log(op);
       op = "";
@@ -76,7 +76,7 @@ fn make_repeat_fasta(str id, str desc, str s, int n) {
   let uint sl = _str.byte_len(s);
   for each (uint i in _uint.range(0u, n as uint)) {
 
-    op += s.(i % sl);
+    _str.push_byte(op, s.(i % sl));
     if (_str.byte_len(op) >= LINE_LENGTH()) {
       log(op);
       op = "";
diff --git a/src/test/run-pass/append-units.rs b/src/test/run-pass/append-units.rs
deleted file mode 100644
index 05b3478b..00000000
--- a/src/test/run-pass/append-units.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-fn main() {
-  auto v = vec(1,2,3);
-  v += 4;
-  v += 5;
-  check (v.(3) == 4);
-  check (v.(4) == 5);
-
-  auto s = "hello";
-  log s;
-  s += 'z' as u8;
-  s += 'y' as u8;
-  log s;
-  check (s.(5) == 'z' as u8);
-  check (s.(6) == 'y' as u8);
-}
diff --git a/src/test/run-pass/lib-str-buf.rs b/src/test/run-pass/lib-str-buf.rs
new file mode 100644
index 00000000..7ba19e92
--- /dev/null
+++ b/src/test/run-pass/lib-str-buf.rs
@@ -0,0 +1,14 @@
+// -*- rust -*-
+
+use std;
+import std._str;
+
+fn main() {
+    auto s = "hello";
+    auto sb = _str.rustrt.str_buf(s);
+    auto s_cstr = _str.rustrt.str_from_cstr(sb);
+    check (_str.eq(s_cstr, s));
+    auto s_buf = _str.rustrt.str_from_buf(sb, 5u);
+    check (_str.eq(s_buf, s));
+}
+
diff --git a/src/test/run-pass/maybe-mutable.rs b/src/test/run-pass/maybe-mutable.rs
new file mode 100644
index 00000000..c0af0867
--- /dev/null
+++ b/src/test/run-pass/maybe-mutable.rs
@@ -0,0 +1,17 @@
+// -*- rust -*-
+
+fn len(vec[mutable? int] v) -> uint {
+    auto i = 0u;
+    for (int x in v) {
+        i += 1u;
+    }
+    ret i;
+}
+
+fn main() {
+    auto v0 = vec(1, 2, 3, 4, 5);
+    log len(v0);
+    auto v1 = vec(mutable 1, 2, 3, 4, 5);
+    log len(v1);
+}
+