mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch CoherenceInfo from oldmap

Browse Source
This commit is contained in:
Seo Sanghyeon 2013-03-21 20:55:28 +09:00
parent dad5c3029d
commit f0beb8c059
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/middle/typeck/check/vtable.rs
View File

@ -241,7 +241,7 @@ pub fn lookup_vtable(vcx: &VtableContext,
// Nothing found. Continue.
}
Some(implementations) => {
let implementations: &mut ~[@Impl] = implementations;
let implementations: &mut ~[@Impl] = *implementations;
// implementations is the list of all impls in scope for
// trait_ty. (Usually, there's just one.)
for uint::range(0, implementations.len()) |i| {

17
src/librustc/middle/typeck/coherence.rs
View File

@ -56,7 +56,7 @@
use util::ppaux::ty_to_str;
use core::result::Ok;
use core::hashmap::linear::LinearSet;
use core::hashmap::linear::{LinearMap, LinearSet};
use core::uint;
use std::oldmap::HashMap;
@ -142,18 +142,17 @@ pub fn method_to_MethodInfo(ast_method: @method) -> @MethodInfo {
pub struct CoherenceInfo {
// Contains implementations of methods that are inherent to a type.
// Methods in these implementations don't need to be exported.
inherent_methods: HashMap<def_id,@mut ~[@Impl]>,
inherent_methods: @mut LinearMap<def_id, @mut ~[@Impl]>,
// Contains implementations of methods associated with a trait. For these,
// the associated trait must be imported at the call site.
extension_methods: HashMap<def_id,@mut ~[@Impl]>,
extension_methods: @mut LinearMap<def_id, @mut ~[@Impl]>,
}
pub fn CoherenceInfo() -> CoherenceInfo {
CoherenceInfo {
inherent_methods: HashMap(),
extension_methods: HashMap(),
inherent_methods: @mut LinearMap::new(),
extension_methods: @mut LinearMap::new(),
}
}
@ -380,7 +379,7 @@ fn add_inherent_method(&self,
.insert(base_def_id, implementation_list);
}
Some(existing_implementation_list) => {
implementation_list = existing_implementation_list;
implementation_list = *existing_implementation_list;
}
}
@ -397,7 +396,7 @@ fn add_trait_method(&self, trait_id: def_id, implementation: @Impl) {
.insert(trait_id, implementation_list);
}
Some(existing_implementation_list) => {
implementation_list = existing_implementation_list;
implementation_list = *existing_implementation_list;
}
}
@ -472,7 +471,7 @@ fn iter_impls_of_trait(&self, trait_def_id: def_id, f: &fn(@Impl)) {
match extension_methods.find(&trait_def_id) {
Some(impls) => {
let impls: &mut ~[@Impl] = impls;
let impls: &mut ~[@Impl] = *impls;
for uint::range(0, impls.len()) |i| {
f(impls[i]);
}