---

yaml
---
r: 13167
b: refs/heads/master
c: d1a65da
h: refs/heads/master
i:
  13165: 4a5efe3
  13163: 75e5c11
  13159: c1f7f31
  13151: 121a234
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: af228711e5f7a3aa5db5cdcefcc5a8f7a91ff675
+refs/heads/master: d1a65da835730aa91a80cfc6011dd5a21f0a95e6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/driver/driver.rs

@@ -205,7 +205,8 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
     time(time_passes, "kind checking",
          bind kind::check_crate(ty_cx, method_map, last_use_map, crate));
 
-    lint::check_crate(ty_cx, crate, sess.opts.lint_opts, time_passes);
+    time(time_passes, "lint checking",
+         bind lint::check_crate(ty_cx, crate, sess.opts.lint_opts));
 
     if upto == cu_no_trans { ret {crate: crate, tcx: some(ty_cx)}; }
     let outputs = option::get(outputs);

trunk/src/rustc/middle/lint.rs

@@ -199,17 +199,6 @@ fn lookup_lint(dict: lint_dict, s: str)
     }
 }
 
-
-// FIXME: Copied from driver.rs, to work around a bug(#1566)
-fn time(do_it: bool, what: str, thunk: fn()) {
-    if !do_it{ ret thunk(); }
-    let start = std::time::precise_time_s();
-    thunk();
-    let end = std::time::precise_time_s();
-    io::stdout().write_str(#fmt("time: %3.3f s\t%s\n",
-                                end - start, what));
-}
-
 fn check_item(i: @ast::item, &&cx: ctxt, v: visit::vt<ctxt>) {
     cx.with_warn_attrs(i.attrs) {|cx|
         for cx.curr.each {|lint, level|
@@ -368,7 +357,7 @@ fn check_item_old_vecs(cx: ctxt, level: level, it: @ast::item) {
 
 
 fn check_crate(tcx: ty::ctxt, crate: @ast::crate,
-               lint_opts: [(lint, level)], time_pass: bool) {
+               lint_opts: [(lint, level)]) {
 
     fn hash_lint(&&lint: lint) -> uint { lint as uint }
     fn eq_lint(&&a: lint, &&b: lint) -> bool { a == b }
@@ -386,14 +375,12 @@ fn check_crate(tcx: ty::ctxt, crate: @ast::crate,
         cx.set_level(lint, level);
     }
 
-    time(time_pass, "lint checking") {||
-        cx.with_warn_attrs(crate.node.attrs) {|cx|
-            let visit = visit::mk_vt(@{
-                visit_item: check_item
-                with *visit::default_visitor()
-            });
-            visit::visit_crate(*crate, cx, visit);
-        }
+    cx.with_warn_attrs(crate.node.attrs) {|cx|
+        let visit = visit::mk_vt(@{
+            visit_item: check_item
+            with *visit::default_visitor()
+        });
+        visit::visit_crate(*crate, cx, visit);
     }
 
     tcx.sess.abort_if_errors();