From 8c12c424e28beb9bf69df8ca0f68096d8b9a6a21 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Thu, 9 Jan 2020 06:49:49 +0100
Subject: [PATCH] {rustc::lint -> rustc_lint}::internal

---
 Cargo.lock                                       | 1 +
 src/librustc/lint.rs                             | 1 -
 src/librustc_lint/Cargo.toml                     | 1 +
 src/{librustc/lint => librustc_lint}/internal.rs | 4 ++--
 src/librustc_lint/lib.rs                         | 3 ++-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename src/{librustc/lint => librustc_lint}/internal.rs (98%)

diff --git a/Cargo.lock b/Cargo.lock
index 54ad60e7150..214114240af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3663,6 +3663,7 @@ dependencies = [
  "log",
  "rustc",
  "rustc_data_structures",
+ "rustc_error_codes",
  "rustc_errors",
  "rustc_feature",
  "rustc_hir",
diff --git a/src/librustc/lint.rs b/src/librustc/lint.rs
index c4332fa0c63..b85982ac3ff 100644
--- a/src/librustc/lint.rs
+++ b/src/librustc/lint.rs
@@ -20,7 +20,6 @@ use syntax::sess::feature_err;
 use rustc_error_codes::*;
 
 mod context;
-pub mod internal;
 mod passes;
 
 pub use context::add_elided_lifetime_in_path_suggestion;
diff --git a/src/librustc_lint/Cargo.toml b/src/librustc_lint/Cargo.toml
index 7e23e705779..abf9f96e647 100644
--- a/src/librustc_lint/Cargo.toml
+++ b/src/librustc_lint/Cargo.toml
@@ -13,6 +13,7 @@ log = "0.4"
 unicode-security = "0.0.2"
 rustc = { path = "../librustc" }
 rustc_errors = { path = "../librustc_errors" }
+rustc_error_codes = { path = "../librustc_error_codes" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_target = { path = "../librustc_target" }
 syntax = { path = "../libsyntax" }
diff --git a/src/librustc/lint/internal.rs b/src/librustc_lint/internal.rs
similarity index 98%
rename from src/librustc/lint/internal.rs
rename to src/librustc_lint/internal.rs
index 33282a7291e..30417bf5a24 100644
--- a/src/librustc/lint/internal.rs
+++ b/src/librustc_lint/internal.rs
@@ -1,8 +1,8 @@
 //! Some lints that are only useful in the compiler or crates that use compiler internals, such as
 //! Clippy.
 
-use crate::lint::context::{EarlyContext, LateContext, LintContext};
-use crate::lint::passes::{EarlyLintPass, LateLintPass};
+use crate::lint::{EarlyContext, LateContext, LintContext};
+use crate::lint::{EarlyLintPass, LateLintPass};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::Applicability;
 use rustc_hir::{GenericArg, HirId, MutTy, Mutability, Path, PathSegment, QPath, Ty, TyKind};
diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index f62e9c466da..e11472e1136 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -26,6 +26,7 @@ extern crate rustc_session;
 mod array_into_iter;
 pub mod builtin;
 mod early;
+mod internal;
 mod late;
 mod levels;
 mod non_ascii_idents;
@@ -53,10 +54,10 @@ use lint::LintId;
 
 use array_into_iter::ArrayIntoIter;
 use builtin::*;
+use internal::*;
 use non_ascii_idents::*;
 use nonstandard_style::*;
 use redundant_semicolon::*;
-use rustc::lint::internal::*;
 use types::*;
 use unused::*;