---

yaml
---
r: 31181
b: refs/heads/dist-snap
c: ad5c4ed
h: refs/heads/master
i:
  31179: 99f96a7
v: v3

Author: msullivan

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 9728d14baeb1f93da6ebe524b840ec9868c296ae
+refs/heads/dist-snap: ad5c4ed351766d5cc97f74f9a4ef784950654e15
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/str.rs

@@ -26,6 +26,7 @@ export
    unpack_slice,
 
    // Adding things to and removing things from a string
+   push_str_no_overallocate,
    push_str,
    push_char,
    pop_char,
@@ -235,13 +236,29 @@ pure fn from_chars(chs: &[const char]) -> str {
     ret buf;
 }
 
+/// Appends a string slice to the back of a string, without overallocating
+#[inline(always)]
+fn push_str_no_overallocate(&lhs: str, rhs: str/&) {
+    unsafe {
+        let llen = lhs.len();
+        let rlen = rhs.len();
+        reserve(lhs, llen + rlen);
+        do as_buf(lhs) |lbuf| {
+            do unpack_slice(rhs) |rbuf, _rlen| {
+                let dst = ptr::offset(lbuf, llen);
+                ptr::memcpy(dst, rbuf, rlen);
+            }
+        }
+        unsafe::set_len(lhs, llen + rlen);
+    }
+}
 /// Appends a string slice to the back of a string
 #[inline(always)]
 fn push_str(&lhs: str, rhs: str/&) {
     unsafe {
         let llen = lhs.len();
         let rlen = rhs.len();
-        reserve(lhs, llen + rlen);
+        reserve_at_least(lhs, llen + rlen);
         do as_buf(lhs) |lbuf| {
             do unpack_slice(rhs) |rbuf, _rlen| {
                 let dst = ptr::offset(lbuf, llen);
@@ -257,7 +274,7 @@ fn push_str(&lhs: str, rhs: str/&) {
 pure fn append(+lhs: str, rhs: str/&) -> str {
     let mut v <- lhs;
     unchecked {
-        push_str(v, rhs);
+        push_str_no_overallocate(v, rhs);
     }
     ret v;
 }

branches/dist-snap/src/libstd/sha1.rs

@@ -265,7 +265,7 @@ mod tests {
         fn a_million_letter_a() -> str {
             let mut i = 0;
             let mut rs = "";
-            while i < 100000 { rs += "aaaaaaaaaa"; i += 1; }
+            while i < 100000 { str::push_str(rs, "aaaaaaaaaa"); i += 1; }
             ret rs;
         }
         // Test messages from FIPS 180-1