From 2b44a6c8f4053cf5f8acf026ffdbc329709e5c3d Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Sun, 5 Jan 2020 10:35:40 +0100
Subject: [PATCH] move {rustc -> rustc_session}::lint::builtin

---
 src/librustc/lint/mod.rs                      |  2 +-
 src/librustc_session/lint.rs                  |  2 ++
 .../lint/builtin.rs                           | 27 ++++++++++++++++---
 src/libsyntax/early_buffered_lints.rs         | 26 ++----------------
 4 files changed, 29 insertions(+), 28 deletions(-)
 rename src/{librustc => librustc_session}/lint/builtin.rs (95%)

diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs
index 1aa4a43a2f2..4f35ef673ef 100644
--- a/src/librustc/lint/mod.rs
+++ b/src/librustc/lint/mod.rs
@@ -38,6 +38,7 @@ pub use crate::lint::context::{
     LintContext, LintStore,
 };
 
+pub use rustc_session::lint::builtin;
 pub use rustc_session::lint::{BufferedEarlyLint, FutureIncompatibleInfo, Level, Lint, LintId};
 pub use rustc_session::lint::{LintArray, LintPass};
 
@@ -331,7 +332,6 @@ pub enum LintSource {
 
 pub type LevelSource = (Level, LintSource);
 
-pub mod builtin;
 mod context;
 pub mod internal;
 mod levels;
diff --git a/src/librustc_session/lint.rs b/src/librustc_session/lint.rs
index 40d40ce7211..2ba3932c7d9 100644
--- a/src/librustc_session/lint.rs
+++ b/src/librustc_session/lint.rs
@@ -4,6 +4,8 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHas
 use rustc_span::edition::Edition;
 use rustc_span::{sym, symbol::Ident, MultiSpan, Span, Symbol};
 
+pub mod builtin;
+
 /// Setting for how to handle a lint.
 #[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)]
 pub enum Level {
diff --git a/src/librustc/lint/builtin.rs b/src/librustc_session/lint/builtin.rs
similarity index 95%
rename from src/librustc/lint/builtin.rs
rename to src/librustc_session/lint/builtin.rs
index 9783bc36ea5..3e8503ef661 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc_session/lint/builtin.rs
@@ -4,10 +4,31 @@
 //! compiler code, rather than using their own custom pass. Those
 //! lints are all available in `rustc_lint::builtin`.
 
-use rustc_session::lint::FutureIncompatibleInfo;
-use rustc_session::{declare_lint, declare_lint_pass};
+use crate::lint::FutureIncompatibleInfo;
+use crate::{declare_lint, declare_lint_pass};
 use rustc_span::edition::Edition;
-use syntax::early_buffered_lints::{ILL_FORMED_ATTRIBUTE_INPUT, META_VARIABLE_MISUSE};
+
+declare_lint! {
+    pub ILL_FORMED_ATTRIBUTE_INPUT,
+    Deny,
+    "ill-formed attribute inputs that were previously accepted and used in practice",
+    @future_incompatible = FutureIncompatibleInfo {
+        reference: "issue #57571 <https://github.com/rust-lang/rust/issues/57571>",
+        edition: None,
+    };
+}
+
+declare_lint! {
+    pub META_VARIABLE_MISUSE,
+    Allow,
+    "possible meta-variable misuse at macro definition"
+}
+
+declare_lint! {
+    pub INCOMPLETE_INCLUDE,
+    Deny,
+    "trailing content in included file"
+}
 
 declare_lint! {
     pub EXCEEDING_BITSHIFTS,
diff --git a/src/libsyntax/early_buffered_lints.rs b/src/libsyntax/early_buffered_lints.rs
index 7724107888a..8df4eb6c9ac 100644
--- a/src/libsyntax/early_buffered_lints.rs
+++ b/src/libsyntax/early_buffered_lints.rs
@@ -3,28 +3,6 @@
 //! Since we cannot have a dependency on `librustc`, we implement some types here that are somewhat
 //! redundant. Later, these types can be converted to types for use by the rest of the compiler.
 
-use rustc_session::declare_lint;
+pub use rustc_session::lint::builtin::ILL_FORMED_ATTRIBUTE_INPUT;
+pub use rustc_session::lint::builtin::{INCOMPLETE_INCLUDE, META_VARIABLE_MISUSE};
 pub use rustc_session::lint::BufferedEarlyLint;
-use rustc_session::lint::FutureIncompatibleInfo;
-
-declare_lint! {
-    pub ILL_FORMED_ATTRIBUTE_INPUT,
-    Deny,
-    "ill-formed attribute inputs that were previously accepted and used in practice",
-    @future_incompatible = FutureIncompatibleInfo {
-        reference: "issue #57571 <https://github.com/rust-lang/rust/issues/57571>",
-        edition: None,
-    };
-}
-
-declare_lint! {
-    pub META_VARIABLE_MISUSE,
-    Allow,
-    "possible meta-variable misuse at macro definition"
-}
-
-declare_lint! {
-    pub INCOMPLETE_INCLUDE,
-    Deny,
-    "trailing content in included file"
-}