---

yaml
---
r: 36780
b: refs/heads/try2
c: 8311c94
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 70fbdb95809e94e3c6537eac78d47656a601bfe3
+refs/heads/try2: 8311c94db47c1dad52045a312082b0302d79b79d
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/uint-template.rs

@@ -179,7 +179,7 @@ pub pure fn to_str_bytes<U>(neg: bool, num: T, radix: uint,
                    f: fn(v: &[u8]) -> U) -> U {
 
     #[inline(always)]
-    fn digit(n: T) -> u8 {
+    pure fn digit(n: T) -> u8 {
         if n <= 9u as T {
             n as u8 + '0' as u8
         } else if n <= 15u as T {
@@ -195,35 +195,27 @@ pub pure fn to_str_bytes<U>(neg: bool, num: T, radix: uint,
     // Worst case: 64-bit number, binary-radix, with
     // a leading negative sign = 65 bytes.
     let buf : [mut u8 * 65] = [mut 0u8, ..65];
+    let len = buf.len();
 
-    // FIXME (#2649): post-snapshot, you can do this without the raw
-    // pointers and unsafe bits, and the codegen will prove it's all
-    // in-bounds, no extra cost.
-
-    unsafe {
-        do vec::as_imm_buf(buf) |p, len| {
-            let mp = p as *mut u8;
-            let mut i = len;
-            let mut n = num;
-            let radix = radix as T;
-            loop {
-                i -= 1u;
-                assert 0u < i && i < len;
-                *ptr::mut_offset(mp, i) = digit(n % radix);
-                n /= radix;
-                if n == 0 as T { break; }
-            }
-
-            assert 0u < i && i < len;
-
-            if neg {
-                i -= 1u;
-                *ptr::mut_offset(mp, i) = '-' as u8;
-            }
-
-            vec::raw::buf_as_slice(ptr::offset(p, i), len - i, f)
-        }
+    let mut i = len;
+    let mut n = num;
+    let radix = radix as T;
+    loop {
+        i -= 1u;
+        assert 0u < i && i < len;
+        buf[i] = digit(n % radix);
+        n /= radix;
+        if n == 0 as T { break; }
+    }
+
+    assert 0u < i && i < len;
+
+    if neg {
+        i -= 1u;
+        buf[i] = '-' as u8;
     }
+
+    f(vec::view(buf, i, len))
 }
 
 /// Convert to a string