---

yaml
---
r: 24533
b: refs/heads/try2
c: 742c05f
h: refs/heads/master
i:
  24531: ed01c6d
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 7762c80d1b25434ad9346ae77a5d08a58f7d05ba
+refs/heads/try2: 742c05f87d51e28a1fa020070554c0e9c292a4e5
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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

@@ -59,7 +59,7 @@ export translate_def_id;
 // what crate that's in and give us a def_id that makes sense for the current
 // build.
 
-fn lookup_hash(d: ebml::doc, eq_fn: fn@(~[u8]) -> bool, hash: uint) ->
+fn lookup_hash(d: ebml::doc, eq_fn: fn@(x:&[u8]) -> bool, hash: uint) ->
    ~[ebml::doc] {
     let index = ebml::get_doc(d, tag_index);
     let table = ebml::get_doc(index, tag_index_table);
@@ -72,16 +72,17 @@ fn lookup_hash(d: ebml::doc, eq_fn: fn@(~[u8]) -> bool, hash: uint) ->
     let belt = tag_index_buckets_bucket_elt;
     do 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::<u8>(*elt.data, elt.start + 4u, elt.end)) {
+        if eq_fn(vec::view::<u8>(*elt.data, elt.start + 4u, elt.end)) {
             vec::push(result, ebml::doc_at(d.data, pos).doc);
         }
     };
     ret result;
 }
 
 fn maybe_find_item(item_id: int, items: ebml::doc) -> option<ebml::doc> {
-    fn eq_item(bytes: ~[u8], item_id: int) -> bool {
-        ret io::u64_from_be_bytes(bytes, 0u, 4u) as int == item_id;
+    fn eq_item(bytes: &[u8], item_id: int) -> bool {
+        ret io::u64_from_be_bytes(vec::slice(bytes, 0u, 4u), 0u, 4u) as int
+            == item_id;
     }
     let eqer = |a| eq_item(a, item_id);
     let found = lookup_hash(items, eqer, hash_node_id(item_id));
@@ -215,8 +216,21 @@ fn enum_variant_ids(item: ebml::doc, cdata: cmd) -> ~[ast::def_id] {
 // Given a path and serialized crate metadata, returns the IDs of the
 // definitions the path may refer to.
 fn resolve_path(path: ~[ast::ident], data: @~[u8]) -> ~[ast::def_id] {
-    fn eq_item(data: ~[u8], s: str) -> bool {
-        ret str::eq(str::from_bytes(data), s);
+    fn eq_item(data: &[u8], s: str) -> bool {
+        // XXX: Use string equality.
+        let data_len = data.len();
+        let s_len = s.len();
+        if data_len != s_len {
+            ret false;
+        }
+        let mut i = 0;
+        while i < data_len {
+            if data[i] != s[i] {
+                ret false;
+            }
+            i += 1;
+        }
+        ret true;
     }
     let s = ast_util::path_name_i(path);
     let md = ebml::doc(data);