From 5cfbbbc9ed32951cf568ac1ca98863a31fb68e35 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 23 Mar 2012 13:32:00 +0100
Subject: [PATCH] Revert resolve kludge that was working around #2049

---
 src/rustc/middle/resolve.rs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs
index 121a0c8d7f3..ad5243a01a9 100644
--- a/src/rustc/middle/resolve.rs
+++ b/src/rustc/middle/resolve.rs
@@ -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();
 }