diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-10-21 23:06:12 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-10-24 14:22:34 -0700 |
| commit | 6bb1df92511e7ecafe0554b01410f4e68d7bc66f (patch) | |
| tree | 77e1bd3a3d541add698d44120bc8293c48fadc45 /src/librustc/metadata | |
| parent | c4907cfd14f9afa1fc26e2fdddf128f834fe5ce5 (diff) | |
| download | rust-6bb1df92511e7ecafe0554b01410f4e68d7bc66f.tar.gz rust-6bb1df92511e7ecafe0554b01410f4e68d7bc66f.zip | |
Remove std::io once and for all!
Diffstat (limited to 'src/librustc/metadata')
| -rw-r--r-- | src/librustc/metadata/decoder.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index be118792f49..aca41f5f4cb 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -28,6 +28,7 @@ use middle::astencode::vtable_decoder_helpers; use std::u64; use std::rt::io; +use std::rt::io::extensions::u64_from_be_bytes; use std::option; use std::str; use std::vec; @@ -55,14 +56,14 @@ fn lookup_hash(d: ebml::Doc, eq_fn: &fn(x:&[u8]) -> bool, hash: u64) -> let index = reader::get_doc(d, tag_index); let table = reader::get_doc(index, tag_index_table); let hash_pos = table.start + (hash % 256 * 4) as uint; - let pos = ::std::io::u64_from_be_bytes(*d.data, hash_pos, 4) as uint; + let pos = u64_from_be_bytes(*d.data, hash_pos, 4) as uint; let tagged_doc = reader::doc_at(d.data, pos); let belt = tag_index_buckets_bucket_elt; let mut ret = None; do reader::tagged_docs(tagged_doc.doc, belt) |elt| { - let pos = ::std::io::u64_from_be_bytes(*elt.data, elt.start, 4) as uint; + let pos = u64_from_be_bytes(*elt.data, elt.start, 4) as uint; if eq_fn(elt.data.slice(elt.start + 4, elt.end)) { ret = Some(reader::doc_at(d.data, pos).doc); false @@ -77,7 +78,7 @@ pub type GetCrateDataCb<'self> = &'self fn(ast::CrateNum) -> Cmd; pub fn maybe_find_item(item_id: int, items: ebml::Doc) -> Option<ebml::Doc> { fn eq_item(bytes: &[u8], item_id: int) -> bool { - return ::std::io::u64_from_be_bytes( + return u64_from_be_bytes( bytes.slice(0u, 4u), 0u, 4u) as int == item_id; } @@ -1253,7 +1254,7 @@ fn family_names_type(fam: Family) -> bool { fn read_path(d: ebml::Doc) -> (~str, uint) { do reader::with_doc_data(d) |desc| { - let pos = ::std::io::u64_from_be_bytes(desc, 0u, 4u) as uint; + let pos = u64_from_be_bytes(desc, 0u, 4u) as uint; let pathbytes = desc.slice(4u, desc.len()); let path = str::from_utf8(pathbytes); |
