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

Revert resolve kludge that was working around #2049

Browse Source
This commit is contained in:
Marijn Haverbeke 2012-03-23 13:32:00 +01:00
parent 3e7a514521
commit 5cfbbbc9ed
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,19 +353,14 @@ fn link_glob(e: @env, vi: @ast::view_item, sc: scopes, _v: vt<scopes>) {
fn resolve_imports(e: env) {
e.used_imports.track = true;
loop {
let mut done = true;
e.imports.items {|id, v|
alt check v {
todo(name, path, span, scopes) {
done = false;
resolve_import(e, id, name, *path, span, scopes);
}
resolved(_, _, _, _, _, _) | is_glob(_, _, _) { }
}
e.imports.items {|id, v|
alt check v {
todo(name, path, span, scopes) {
resolve_import(e, id, name, *path, span, scopes);
}
resolved(_, _, _, _, _, _) | is_glob(_, _, _) { }
}
if done { break; }
};
}
e.used_imports.track = false;
e.sess.abort_if_errors();
}