---

yaml
---
r: 29913
b: refs/heads/incoming
c: 9ea6b3a
h: refs/heads/master
i:
  29911: 084b7b6
v: v3

Author: pcwalton

[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: 69daeffddb534c4415967f18f795bc5b6dc262d2
+refs/heads/incoming: 9ea6b3a32e808c4cf1e2d45cc26363e700944ef9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/io.rs

@@ -521,7 +521,7 @@ fn u64_to_be_bytes<T>(n: u64, size: uint, f: fn(v: &[u8]) -> T) -> T {
     }
 }
 
-fn u64_from_be_bytes(data: ~[u8], start: uint, size: uint) -> u64 {
+fn u64_from_be_bytes(data: &[const u8], start: uint, size: uint) -> u64 {
     let mut sz = size;
     assert (sz <= 8u);
     let mut val = 0_u64;

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

@@ -121,7 +121,7 @@ impl T: iter::TimesIx {
  *
  * `buf` must not be empty
  */
-fn parse_buf(buf: ~[u8], radix: uint) -> option<T> {
+fn parse_buf(buf: &[const u8], radix: uint) -> option<T> {
     if vec::len(buf) == 0u { return none; }
     let mut i = vec::len(buf) - 1u;
     let mut power = 1u as T;

branches/incoming/src/rustc/metadata/decoder.rs

@@ -72,7 +72,7 @@ fn lookup_hash(d: ebml::doc, eq_fn: fn(x:&[u8]) -> bool, hash: uint) ->
     let belt = tag_index_buckets_bucket_elt;
     for ebml::tagged_docs(bucket, belt) |elt| {
         let pos = io::u64_from_be_bytes(*elt.data, elt.start, 4u) as uint;
-        if eq_fn(vec::slice(*elt.data, elt.start + 4u, elt.end)) {
+        if eq_fn(vec::view(*elt.data, elt.start + 4u, elt.end)) {
             return some(ebml::doc_at(d.data, pos).doc);
         }
     };
@@ -81,7 +81,7 @@ fn lookup_hash(d: ebml::doc, eq_fn: fn(x:&[u8]) -> bool, hash: uint) ->
 
 fn maybe_find_item(item_id: int, items: ebml::doc) -> option<ebml::doc> {
     fn eq_item(bytes: &[u8], item_id: int) -> bool {
-        return io::u64_from_be_bytes(vec::slice(bytes, 0u, 4u), 0u, 4u) as int
+        return io::u64_from_be_bytes(vec::view(bytes, 0u, 4u), 0u, 4u) as int
             == item_id;
     }
     lookup_hash(items,

branches/incoming/src/rustc/metadata/tydecode.rs

@@ -391,8 +391,9 @@ fn parse_def_id(buf: &[u8]) -> ast::def_id {
         error!{"didn't find ':' when parsing def id"};
         fail;
     }
-    let crate_part = vec::slice(buf, 0u, colon_idx);
-    let def_part = vec::slice(buf, colon_idx + 1u, len);
+
+    let crate_part = vec::view(buf, 0u, colon_idx);
+    let def_part = vec::view(buf, colon_idx + 1u, len);
 
     let crate_num = match uint::parse_buf(crate_part, 10u) {
        some(cn) => cn as int,