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

librustc: De-@mut ImportResolution::type_id

Browse Source
This commit is contained in:
Patrick Walton 2013-12-21 17:48:19 -08:00
parent 9253df1844
commit 4b53a2cdd8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc/middle/resolve.rs
View File

@ -364,13 +364,13 @@ struct ImportResolution {
type_target: RefCell<Option<Target>>,
/// The source node of the `use` directive leading to the type target
/// being non-none
type_id: NodeId,
type_id: Cell<NodeId>,
}
impl ImportResolution {
fn new(id: NodeId, is_public: bool) -> ImportResolution {
ImportResolution {
type_id: id,
type_id: Cell::new(id),
value_id: Cell::new(id),
outstanding_references: Cell::new(0),
value_target: RefCell::new(None),
@ -389,7 +389,7 @@ fn target_for_namespace(&self, namespace: Namespace)
fn id(&self, namespace: Namespace) -> NodeId {
match namespace {
TypeNS => self.type_id,
TypeNS => self.type_id.get(),
ValueNS => self.value_id.get(),
}
}
@ -1973,7 +1973,7 @@ fn build_import_directive(&mut self,
resolution.outstanding_references.get() + 1);
// the source of this name is different now
resolution.type_id = id;
resolution.type_id.set(id);
resolution.value_id.set(id);
}
None => {
@ -2435,7 +2435,7 @@ fn get_binding(this: &mut Resolver,
name_bindings.type_def.get().unwrap().type_def);
import_resolution.type_target.set(
Some(Target::new(target_module, name_bindings)));
import_resolution.type_id = directive.id;
import_resolution.type_id.set(directive.id);
used_public = name_bindings.defined_in_public_namespace(TypeNS);
}
UnboundResult => { /* Continue. */ }
@ -2604,7 +2604,7 @@ fn resolve_glob_import(&mut self,
debug!("(resolving glob import) ... for type target");
dest_import_resolution.type_target.set(
Some(Target::new(containing_module, name_bindings)));
dest_import_resolution.type_id = id;
dest_import_resolution.type_id.set(id);
}
dest_import_resolution.is_public.set(is_public);
};
@ -5392,7 +5392,8 @@ fn search_for_traits_containing_method(&mut self, name: Ident)
&mut found_traits,
trait_def_id, name);
self.used_imports.insert(
import_resolution.type_id);
import_resolution.type_id
.get());
}
}
_ => {