---

erickt · erickt · commit a02edb74e7d3 · 2012-08-30T20:40:52.000-07:00
yaml --- r: 30207 b: refs/heads/incoming c: 94c3975 h: refs/heads/master i: 30205: 6885499 30203: be7ef01 30199: 3766a5e 30191: 32f78e8 30175: 06d3eec 30143: 8a8d67c 30079: 9d50a83 29951: f50bb74 29695: 1c16e97 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0e1a4a4da29caadba5d5cd86a5cd2587fdb0755d
+refs/heads/incoming: 94c3975a9a4948a17cc63022e3ba5dbe87171a9d
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/str.rs b/branches/incoming/src/libcore/str.rs
@@ -220,14 +220,9 @@ fn push_char(&s: ~str, ch: char) {
                 *ptr::mut_offset(buf, off + 5u) =
                     (code & 63u | tag_cont) as u8;
             }
-            *ptr::mut_offset(buf, off + nb) = 0u8;
         }
 
-        do as_bytes(s) |bytes| {
-            let mut mut_bytes: ~[u8] = ::unsafe::reinterpret_cast(bytes);
-            vec::unsafe::set_len(mut_bytes, new_len + 1u);
-            ::unsafe::forget(mut_bytes);
-        }
+        unsafe::set_len(s, new_len);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -220,14 +220,9 @@ fn push_char(&s: ~str, ch: char) {`
`220`	`220`	`*ptr::mut_offset(buf, off + 5u) =`
`221`	`221`	`(code & 63u \| tag_cont) as u8;`
`222`	`222`	`}`
`223`		`- *ptr::mut_offset(buf, off + nb) = 0u8;`
`224`	`223`	`}`
`225`	`224`
`226`		`- do as_bytes(s) \|bytes\| {`
`227`		`- let mut mut_bytes: ~[u8] = ::unsafe::reinterpret_cast(bytes);`
`228`		`- vec::unsafe::set_len(mut_bytes, new_len + 1u);`
`229`		`- ::unsafe::forget(mut_bytes);`
`230`		`- }`
	`225`	`+ unsafe::set_len(s, new_len);`
`231`	`226`	`}`
`232`	`227`	`}`
`233`	`228`