Skip to content

Commit 5cfbbbc

Browse files
committed
Revert resolve kludge that was working around #2049
1 parent 3e7a514 commit 5cfbbbc

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/rustc/middle/resolve.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -353,19 +353,14 @@ fn map_crate(e: @env, c: @ast::crate) {
353353

354354
fn resolve_imports(e: env) {
355355
e.used_imports.track = true;
356-
loop {
357-
let mut done = true;
358-
e.imports.items {|id, v|
359-
alt check v {
360-
todo(name, path, span, scopes) {
361-
done = false;
362-
resolve_import(e, id, name, *path, span, scopes);
363-
}
364-
resolved(_, _, _, _, _, _) | is_glob(_, _, _) { }
365-
}
356+
e.imports.items {|id, v|
357+
alt check v {
358+
todo(name, path, span, scopes) {
359+
resolve_import(e, id, name, *path, span, scopes);
360+
}
361+
resolved(_, _, _, _, _, _) | is_glob(_, _, _) { }
366362
}
367-
if done { break; }
368-
};
363+
}
369364
e.used_imports.track = false;
370365
e.sess.abort_if_errors();
371366
}

0 commit comments

Comments
 (0)