Move lint.rs out of middle

We're going to have more modules under lint, and the paths get unwieldy. We
also plan to have lints run at multiple points in the compilation pipeline.

15 files changed, 16 insertions, 14 deletions

diff --git a/src/librustc/driver/config.rs b/src/librustc/driver/config.rs
index 95e0af028fa..512bdce5d88 100644
--- a/src/librustc/driver/config.rs
+++ b/src/librustc/driver/config.rs
@@ -19,7 +19,7 @@ use back;
 use back::link;
 use back::target_strs;
 use back::{arm, x86, x86_64, mips, mipsel};
-use middle::lint;
+use lint;
 
 use syntax::abi;
 use syntax::ast;
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index ac6558aef65..fca6db23be6 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -20,12 +20,13 @@ use metadata::common::LinkMeta;
 use metadata::creader;
 use middle::cfg;
 use middle::cfg::graphviz::LabelledCFG;
-use middle::{trans, freevars, stability, kind, ty, typeck, lint, reachable};
+use middle::{trans, freevars, stability, kind, ty, typeck, reachable};
 use middle::dependency_format;
 use middle;
 use plugin::load::Plugins;
 use plugin::registry::Registry;
 use plugin;
+use lint;
 use util::common::time;
 use util::ppaux;
 use util::nodemap::{NodeSet};
diff --git a/src/librustc/driver/mod.rs b/src/librustc/driver/mod.rs
index f55fd78762c..71c97f0265f 100644
--- a/src/librustc/driver/mod.rs
+++ b/src/librustc/driver/mod.rs
@@ -13,7 +13,7 @@ pub use syntax::diagnostic;
 use back::link;
 use driver::driver::{Input, FileInput, StrInput};
 use driver::session::{Session, build_session};
-use middle::lint;
+use lint;
 use metadata;
 
 use std::any::AnyRefExt;
diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs
index f98831714f2..2978ff7f780 100644
--- a/src/librustc/driver/session.rs
+++ b/src/librustc/driver/session.rs
@@ -14,7 +14,7 @@ use driver::driver;
 use front;
 use metadata::cstore::CStore;
 use metadata::filesearch;
-use middle::lint;
+use lint;
 use util::nodemap::NodeMap;
 
 use syntax::ast::NodeId;
diff --git a/src/librustc/front/feature_gate.rs b/src/librustc/front/feature_gate.rs
index 59e52b9359f..3d6b565fb86 100644
--- a/src/librustc/front/feature_gate.rs
+++ b/src/librustc/front/feature_gate.rs
@@ -18,7 +18,7 @@
 //! Features are enabled in programs via the crate-level attributes of
 //! `#![feature(...)]` with a comma-separated list of features.
 
-use middle::lint;
+use lint;
 
 use syntax::abi::RustIntrinsic;
 use syntax::ast::NodeId;
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 947ae65a3aa..b933150dba4 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -56,7 +56,6 @@ pub mod middle {
     pub mod check_match;
     pub mod check_const;
     pub mod check_static;
-    pub mod lint;
     pub mod borrowck;
     pub mod dataflow;
     pub mod mem_categorization;
@@ -113,6 +112,8 @@ pub mod driver;
 
 pub mod plugin;
 
+pub mod lint;
+
 pub mod util {
     pub mod common;
     pub mod ppaux;
diff --git a/src/librustc/middle/lint.rs b/src/librustc/lint/mod.rs
index c2fad75d6b8..c2fad75d6b8 100644
--- a/src/librustc/middle/lint.rs
+++ b/src/librustc/lint/mod.rs
diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs
index 15352391418..f5b2e3c7e77 100644
--- a/src/librustc/middle/dead.rs
+++ b/src/librustc/middle/dead.rs
@@ -13,7 +13,7 @@
 // from live codes are live, and everything else is dead.
 
 use middle::def;
-use middle::lint::{Allow, contains_lint, DeadCode};
+use lint::{Allow, contains_lint, DeadCode};
 use middle::privacy;
 use middle::ty;
 use middle::typeck;
diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs
index 8cd840582ba..a556f4d6b8d 100644
--- a/src/librustc/middle/liveness.rs
+++ b/src/librustc/middle/liveness.rs
@@ -104,10 +104,10 @@
 
 use middle::def::*;
 use middle::freevars;
-use middle::lint::{UnusedVariable, DeadAssignment};
 use middle::mem_categorization::Typer;
 use middle::pat_util;
 use middle::ty;
+use lint::{UnusedVariable, DeadAssignment};
 use util::nodemap::NodeMap;
 
 use std::fmt;
diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs
index f69dc8e31d6..777b9a55e4b 100644
--- a/src/librustc/middle/privacy.rs
+++ b/src/librustc/middle/privacy.rs
@@ -17,7 +17,7 @@ use std::mem::replace;
 
 use metadata::csearch;
 use middle::def;
-use middle::lint;
+use lint;
 use middle::resolve;
 use middle::ty;
 use middle::typeck::{MethodCall, MethodMap, MethodOrigin, MethodParam};
diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs
index ee6c5e1f9bc..c2a660677a5 100644
--- a/src/librustc/middle/resolve.rs
+++ b/src/librustc/middle/resolve.rs
@@ -15,7 +15,7 @@ use metadata::csearch;
 use metadata::decoder::{DefLike, DlDef, DlField, DlImpl};
 use middle::def::*;
 use middle::lang_items::LanguageItems;
-use middle::lint::{UnnecessaryQualification, UnusedImports};
+use lint::{UnnecessaryQualification, UnusedImports};
 use middle::pat_util::pat_bindings;
 use middle::subst::{ParamSpace, FnSpace, TypeSpace};
 use util::nodemap::{NodeMap, DefIdSet, FnvHashMap};
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
index d6aaad92f1d..e1416380f35 100644
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@ -36,7 +36,7 @@ use lib::llvm::{ModuleRef, ValueRef, BasicBlockRef};
 use lib::llvm::{llvm, Vector};
 use lib;
 use metadata::{csearch, encoder, loader};
-use middle::lint;
+use lint;
 use middle::astencode;
 use middle::lang_items::{LangItem, ExchangeMallocFnLangItem, StartFnLangItem};
 use middle::weak_lang_items;
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index 00a0e8fc39b..1284992e150 100644
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -14,7 +14,7 @@ use back::svh::Svh;
 use driver::session::Session;
 use metadata::csearch;
 use mc = middle::mem_categorization;
-use middle::lint;
+use lint;
 use middle::const_eval;
 use middle::def;
 use middle::dependency_format;
diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs
index 04db13feff6..82cd43f9eee 100644
--- a/src/librustc/middle/typeck/check/mod.rs
+++ b/src/librustc/middle/typeck/check/mod.rs
@@ -79,7 +79,7 @@ type parameter).
 
 use middle::const_eval;
 use middle::def;
-use middle::lint::UnreachableCode;
+use lint::UnreachableCode;
 use middle::pat_util::pat_id_map;
 use middle::pat_util;
 use middle::subst;
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 061798cb23e..3a481abc775 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -11,7 +11,7 @@
 use rustc;
 use rustc::{driver, middle};
 use rustc::middle::privacy;
-use rustc::middle::lint;
+use rustc::lint;
 
 use syntax::ast;
 use syntax::parse::token;