---

yaml
---
r: 13238
b: refs/heads/master
c: 5a4e534
h: refs/heads/master
v: v3

Author: msullivan

[refs]

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

trunk/src/rustc/driver/driver.rs

@@ -157,6 +157,9 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
         time(time_passes, "core injection",
              bind front::core_inject::maybe_inject_libcore_ref(sess, crate));
 
+    time(time_passes, "building warning settings table",
+         bind lint::build_settings_crate(sess, crate));
+
     let ast_map =
         time(time_passes, "ast indexing",
              bind syntax::ast_map::map_crate(sess.diagnostic(), *crate));
@@ -204,10 +207,8 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
              bind middle::alias::check_crate(ty_cx, crate));
     time(time_passes, "kind checking",
          bind kind::check_crate(ty_cx, method_map, last_use_map, crate));
-
-    let _warning_settings =
-        time(time_passes, "lint checking",
-             bind lint::check_crate(ty_cx, crate, sess.opts.lint_opts));
+    time(time_passes, "lint checking",
+         bind lint::check_crate(ty_cx, crate));
 
     if upto == cu_no_trans { ret {crate: crate, tcx: some(ty_cx)}; }
     let outputs = option::get(outputs);
@@ -528,6 +529,7 @@ fn build_session_(
         sopts.maybe_sysroot,
         sopts.target_triple,
         sopts.addl_lib_search_paths);
+    let warning_settings = lint::mk_warning_settings();
     @{targ_cfg: target_cfg,
       opts: sopts,
       cstore: cstore,
@@ -544,7 +546,8 @@ fn build_session_(
       span_diagnostic: span_diagnostic_handler,
       filesearch: filesearch,
       mut building_library: false,
-      working_dir: os::getcwd()}
+      working_dir: os::getcwd(),
+      warning_settings: warning_settings}
 }
 
 fn parse_pretty(sess: session, &&name: str) -> pp_mode {

trunk/src/rustc/driver/session.rs

@@ -9,6 +9,7 @@ import back::target_strs;
 import back::link;
 import middle::lint;
 
+
 enum os { os_win32, os_macos, os_linux, os_freebsd, }
 
 enum arch { arch_x86, arch_x86_64, arch_arm, }
@@ -82,7 +83,8 @@ type session = @{targ_cfg: @config,
                  span_diagnostic: diagnostic::span_handler,
                  filesearch: filesearch::filesearch,
                  mut building_library: bool,
-                 working_dir: str};
+                 working_dir: str,
+                 warning_settings: lint::warning_settings};
 
 impl session for session {
     fn span_fatal(sp: span, msg: str) -> ! {
@@ -127,6 +129,21 @@ impl session for session {
     fn unimpl(msg: str) -> ! {
         self.span_diagnostic.handler().unimpl(msg)
     }
+    fn span_lint_level(level: lint::level,
+                       sp: span, msg: str) {
+        alt level {
+          lint::ignore { }
+          lint::warn { self.span_warn(sp, msg); }
+          lint::error { self.span_err(sp, msg); }
+        }
+    }
+    fn span_lint(lint_mode: lint::lint,
+                 expr_id: ast::node_id, item_id: ast::node_id,
+                 span: span, msg: str) {
+        let level = lint::get_warning_settings_level(
+            self.warning_settings, lint_mode, expr_id, item_id);
+        self.span_lint_level(level, span, msg);
+    }
     fn next_node_id() -> ast::node_id {
         ret syntax::parse::next_node_id(self.parse_sess);
     }