---

pcwalton · pcwalton · commit 7b2fe5c63dff · 2012-09-04T15:23:30.000-07:00
yaml --- r: 30320 b: refs/heads/incoming c: 8415515 h: refs/heads/master 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: 127144bf38f5bf81112bb304efb95a80d54bcaac
+refs/heads/incoming: 8415515cbee679ddd2a17bbb152da10f1d947359
 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
@@ -1752,8 +1752,17 @@ pure fn as_bytes<T>(s: ~str, f: fn(~[u8]) -> T) -> T {
     }
 }
 
+/**
+ * Work with the byte buffer of a string as a byte slice.
+ *
+ * The byte slice does not include the null terminator.
+ */
 pure fn as_bytes_slice(s: &a/str) -> &a/[u8] {
-    unsafe { ::unsafe::reinterpret_cast(&s) }
+    unsafe {
+        let (ptr, len): (*u8, uint) = ::unsafe::reinterpret_cast(&s);
+        let outgoing_tuple: (*u8, uint) = (ptr, len - 1);
+        return ::unsafe::reinterpret_cast(&outgoing_tuple);
+    }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1752,8 +1752,17 @@ pure fn as_bytes<T>(s: ~str, f: fn(~[u8]) -> T) -> T {`
`1752`	`1752`	`}`
`1753`	`1753`	`}`
`1754`	`1754`
	`1755`	`+/**`
	`1756`	`+ * Work with the byte buffer of a string as a byte slice.`
	`1757`	`+ *`
	`1758`	`+ * The byte slice does not include the null terminator.`
	`1759`	`+ */`
`1755`	`1760`	`pure fn as_bytes_slice(s: &a/str) -> &a/[u8] {`
`1756`		`- unsafe { ::unsafe::reinterpret_cast(&s) }`
	`1761`	`+ unsafe {`
	`1762`	`+ let (ptr, len): (*u8, uint) = ::unsafe::reinterpret_cast(&s);`
	`1763`	`+ let outgoing_tuple: (*u8, uint) = (ptr, len - 1);`
	`1764`	`+ return ::unsafe::reinterpret_cast(&outgoing_tuple);`
	`1765`	`+ }`
`1757`	`1766`	`}`
`1758`	`1767`
`1759`	`1768`	`/**`