---

yaml
---
r: 107245
b: refs/heads/dist-snap
c: 55f81bc
h: refs/heads/master
i:
  107243: ffff05d
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 520c82e0e971f4107d09ae18670274a278fac382
+refs/heads/dist-snap: 55f81bce8372b3278454ab4c72429d745facd16d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/driver/session.rs

@@ -145,7 +145,7 @@ pub struct options {
     llvm_args: ~[~str],
     debuginfo: bool,
     extra_debuginfo: bool,
-    lint_opts: ~[(lint::lint, lint::level)],
+    lint_opts: ~[(lint::Lint, lint::level)],
     save_temps: bool,
     output_type: back::link::OutputType,
     // This is mutable for rustpkg, which updates search paths based on the
@@ -214,7 +214,7 @@ pub struct Session_ {
     building_library: Cell<bool>,
     working_dir: Path,
     lints: RefCell<HashMap<ast::NodeId,
-                           ~[(lint::lint, codemap::Span, ~str)]>>,
+                           ~[(lint::Lint, codemap::Span, ~str)]>>,
     node_id: Cell<ast::NodeId>,
     outputs: @RefCell<~[OutputStyle]>,
 }
@@ -268,7 +268,7 @@ impl Session_ {
         self.span_diagnostic.handler().unimpl(msg)
     }
     pub fn add_lint(&self,
-                    lint: lint::lint,
+                    lint: lint::Lint,
                     id: ast::NodeId,
                     sp: Span,
                     msg: ~str) {
@@ -443,12 +443,12 @@ pub fn collect_outputs(session: &Session,
                 Some(n) if "staticlib" == n => Some(OutputStaticlib),
                 Some(n) if "bin" == n => Some(OutputExecutable),
                 Some(_) => {
-                    session.add_lint(lint::unknown_crate_type, ast::CRATE_NODE_ID,
+                    session.add_lint(lint::UnknownCrateType, ast::CRATE_NODE_ID,
                                      a.span, ~"invalid `crate_type` value");
                     None
                 }
                 _ => {
-                    session.add_lint(lint::unknown_crate_type, ast::CRATE_NODE_ID,
+                    session.add_lint(lint::UnknownCrateType, ast::CRATE_NODE_ID,
                                     a.span, ~"`crate_type` requires a value");
                     None
                 }

branches/dist-snap/src/librustc/front/feature_gate.rs

@@ -233,7 +233,7 @@ pub fn check_crate(sess: Session, crate: &ast::Crate) {
                                                      directive not necessary");
                         }
                         None => {
-                            sess.add_lint(lint::unknown_features,
+                            sess.add_lint(lint::UnknownFeatures,
                                           ast::CRATE_NODE_ID,
                                           mi.span,
                                           ~"unknown feature");

branches/dist-snap/src/librustc/middle/dead.rs

@@ -15,7 +15,7 @@
 use middle::ty;
 use middle::typeck;
 use middle::privacy;
-use middle::lint::dead_code;
+use middle::lint::DeadCode;
 
 use std::hashmap::HashSet;
 use syntax::ast;
@@ -328,7 +328,7 @@ impl DeadVisitor {
 
     fn warn_dead_code(&mut self, id: ast::NodeId,
                       span: codemap::Span, ident: &ast::Ident) {
-        self.tcx.sess.add_lint(dead_code, id, span,
+        self.tcx.sess.add_lint(DeadCode, id, span,
                                format!("code is never used: `{}`",
                                        token::ident_to_str(ident)));
     }