---

yaml
---
r: 4607
b: refs/heads/master
c: 3814d8d
h: refs/heads/master
i:
  4605: 4a6c3eb
  4603: 41d05f7
  4599: 7de6e37
  4591: f93aeb8
  4575: 730e6d3
  4543: 6f5865e
  4479: b9b9568
  4351: 280c87a
  4095: 1cb4a68
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c06d95f1788f7c3b708f0be1fc452c35abf03841
+refs/heads/master: 3814d8d4b0fc5d31d096c4e014229445751e14e7

trunk/src/test/run-pass/vec-append.rs

@@ -3,34 +3,33 @@
 // -*- rust -*-
 use std;
 import std::str;
-import std::vec;
-
+import std::ivec;
 
 // FIXME: import std::dbg::const_refcount. Currently
 // cross-crate const references don't work.
 const const_refcount: uint = 0x7bad_face_u;
 
 fn fast_growth() {
-    let v: vec[int] = [1, 2, 3, 4, 5];
-    v += [6, 7, 8, 9, 0];
+    let v: [int] = ~[1, 2, 3, 4, 5];
+    v += ~[6, 7, 8, 9, 0];
     log v.(9);
     assert (v.(0) == 1);
     assert (v.(7) == 8);
     assert (v.(9) == 0);
 }
 
 fn slow_growth() {
-    let v: vec[int] = [];
-    let u: vec[int] = v;
-    v += [17];
+    let v: [int] = ~[];
+    let u: [int] = v;
+    v += ~[17];
     log v.(0);
     assert (v.(0) == 17);
 }
 
 fn slow_growth2_helper(s: str) { // ref up: s
 
-    obj acc(mutable v: vec[str]) {
-        fn add(s: &str) { v += [s]; }
+    obj acc(mutable v: [str]) {
+        fn add(s: &str) { v += ~[s]; }
     }
     let ss: str = s; // ref up: s
 
@@ -47,26 +46,21 @@ fn slow_growth2_helper(s: str) { // ref up: s
          * mumble, the existing str in the originally- shared vec.
          */
 
-        let v: vec[str] = [mumble]; // ref up: v, mumble
+        let v: [str] = ~[mumble]; // ref up: mumble
 
-        log vec::refcount[str](v);
-        let a: acc = acc(v); // ref up: a, v
+        let a: acc = acc(v);
 
-        log vec::refcount[str](v);
-        assert (vec::refcount[str](v) == 2u);
-        a.add(s); // ref up: mumble, s.  ref down: v
+        a.add(s); // ref up: mumble, s
 
-        log vec::refcount[str](v);
         log str::refcount(s);
         log str::refcount(mumble);
-        assert (vec::refcount[str](v) == 1u);
         assert (str::refcount(s) == const_refcount);
         assert (str::refcount(mumble) == const_refcount);
         log v.(0);
-        log vec::len[str](v);
+        log ivec::len[str](v);
         assert (str::eq(v.(0), mumble));
-        assert (vec::len[str](v) == 1u);
-    } // ref down: a, mumble, s, v
+        assert (ivec::len[str](v) == 1u);
+    } // ref down: mumble, s,
 
     log str::refcount(s);
     log str::refcount(mumble);