---

erickt · erickt · commit 8cbe8217ffe3 · 2012-08-22T19:10:28.000-07:00
yaml --- r: 30001 b: refs/heads/incoming c: 007e47d h: refs/heads/master i: 29999: 5766600 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: cfa71a135b2dfd5c5294737e392bb3b22929d940
+refs/heads/incoming: 007e47d710c362f51d4133e9c05a638cc0bacb5a
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libstd/ebml.rs b/branches/incoming/src/libstd/ebml.rs
@@ -285,13 +285,7 @@ impl writer {
     }
 
     fn wr_tagged_str(tag_id: uint, v: ~str) {
-        // Lame: can't use str::as_bytes() here because the resulting
-        // vector is NULL-terminated.  Annoyingly, the underlying
-        // writer interface doesn't permit us to write a slice of a
-        // vector.  We need first-class slices, I think.
-
-        // str::as_bytes(v) {|b| self.wr_tagged_bytes(tag_id, b); }
-        self.wr_tagged_bytes(tag_id, str::bytes(v));
+        str::byte_slice(v, |b| self.wr_tagged_bytes(tag_id, b));
     }
 
     fn wr_bytes(b: &[u8]) {

Original file line number	Diff line number	Diff line change
`@@ -285,13 +285,7 @@ impl writer {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`fn wr_tagged_str(tag_id: uint, v: ~str) {`
`288`		`- // Lame: can't use str::as_bytes() here because the resulting`
`289`		`- // vector is NULL-terminated. Annoyingly, the underlying`
`290`		`- // writer interface doesn't permit us to write a slice of a`
`291`		`- // vector. We need first-class slices, I think.`
`292`		`-`
`293`		`- // str::as_bytes(v) {\|b\| self.wr_tagged_bytes(tag_id, b); }`
`294`		`- self.wr_tagged_bytes(tag_id, str::bytes(v));`
	`288`	`+ str::byte_slice(v, \|b\| self.wr_tagged_bytes(tag_id, b));`
`295`	`289`	`}`
`296`	`290`
`297`	`291`	`fn wr_bytes(b: &[u8]) {`