---

yaml
---
r: 2907
b: refs/heads/master
c: 5144f79
h: refs/heads/master
i:
  2905: 838a9d5
  2903: 4e482a8
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75ffe657dbd202cf22175f0234e80f4e09c5d499
+refs/heads/master: 5144f790fe7c57224ba164ca0ecc81cfcc4ddd20

trunk/src/lib/str.rs

@@ -336,8 +336,9 @@ fn refcount(str s) -> uint {
     if (r == dbg::const_refcount) {
         ret r;
     } else {
-        // -1 because calling this function incremented the refcount.
-        ret  r - 1u;
+        // -2 because calling this function and the native function both
+        // incremented the refcount.
+        ret  r - 2u;
     }
 }
 

trunk/src/lib/vec.rs

@@ -50,8 +50,9 @@ fn refcount[T](array[T] v) -> uint {
     if (r == dbg::const_refcount) {
         ret r;
     } else {
-        // -1 because calling this function incremented the refcount.
-        ret  r - 1u;
+        // -2 because calling this function and the native function both
+        // incremented the refcount.
+        ret  r - 2u;
     }
 }
 

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

@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // -*- rust -*-
 
 use std;
@@ -51,13 +48,13 @@ fn slow_growth2_helper(str s) {   // ref up: s
      * mumble, the existing str in the originally- shared vec.
      */
     let vec[str] v = [mumble]; // ref up: v, mumble
+    log vec::refcount[str](v);
     let acc a = acc(v);           // ref up: a, v
 
     log vec::refcount[str](v);
     assert (vec::refcount[str](v) == 2u);
 
     a.add(s);                     // ref up: mumble, s.  ref down: v
-
     log vec::refcount[str](v);
     log str::refcount(s);
     log str::refcount(mumble);