bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Kludge in resolve to be able to land builtins

Browse source 
Something strange is happening to hash maps. I'm still investigating but
want to get my snapshot built in the meantime. (Problem only happened on
OS X.)
This commit is contained in:
Marijn Haverbeke 2012-03-23 11:09:19 +01:00
parent cdb93d70a1
commit 6374ffc5f3
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/rustc/middle/resolve.rs
View file

@ -353,14 +353,19 @@ fn map_crate(e: @env, c: @ast::crate) {
fn resolve_imports(e: env) { fn resolve_imports(e: env) {
e.used_imports.track = true; e.used_imports.track = true;
e.imports.values {|v| loop {
alt v { let mut done = true;
todo(node_id, name, path, span, scopes) { e.imports.values {|v|
resolve_import(e, local_def(node_id), name, *path, span, scopes); alt check v {
} todo(node_id, name, path, span, scopes) {
resolved(_, _, _, _, _, _) | is_glob(_, _, _) { } done = false;
_ { e.sess.bug("shouldn't see a resolving in resolve_imports"); } resolve_import(e, local_def(node_id), name, *path, span,
scopes);
}
resolved(_, _, _, _, _, _) | is_glob(_, _, _) { }
}
} }
if done { break; }
}; };
e.used_imports.track = false; e.used_imports.track = false;
e.sess.abort_if_errors(); e.sess.abort_if_errors();