From 52d4d478a11c459645ba13abffcaf95014f38509 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Fri, 29 Nov 2019 15:45:26 -0500
Subject: [PATCH] Move ParseSess to librustc_session

---
 src/librustc_session/lib.rs                          |  1 +
 src/{libsyntax/sess.rs => librustc_session/parse.rs} | 11 +++++++----
 src/libsyntax/lib.rs                                 |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
 rename src/{libsyntax/sess.rs => librustc_session/parse.rs} (95%)

diff --git a/src/librustc_session/lib.rs b/src/librustc_session/lib.rs
index 8bcd1f1af70..d5ccb97a7f9 100644
--- a/src/librustc_session/lib.rs
+++ b/src/librustc_session/lib.rs
@@ -3,3 +3,4 @@
 #[macro_use]
 pub mod lint;
 pub mod node_id;
+pub mod parse;
diff --git a/src/libsyntax/sess.rs b/src/librustc_session/parse.rs
similarity index 95%
rename from src/libsyntax/sess.rs
rename to src/librustc_session/parse.rs
index 555e8a134f7..a9fdd4a1242 100644
--- a/src/libsyntax/sess.rs
+++ b/src/librustc_session/parse.rs
@@ -1,10 +1,10 @@
 //! Contains `ParseSess` which holds state living beyond what one `Parser` might.
 //! It also serves as an input to the parser itself.
 
-use crate::ast::{CrateConfig, NodeId};
-use crate::early_buffered_lints::BufferedEarlyLint;
+use crate::node_id::NodeId;
+use crate::lint::BufferedEarlyLint;
 
-use errors::{Applicability, emitter::SilentEmitter, Handler, ColorConfig, DiagnosticBuilder};
+use rustc_errors::{Applicability, emitter::SilentEmitter, Handler, ColorConfig, DiagnosticBuilder};
 use rustc_data_structures::fx::{FxHashSet, FxHashMap};
 use rustc_data_structures::sync::{Lrc, Lock, Once};
 use rustc_feature::UnstableFeatures;
@@ -16,6 +16,9 @@
 use std::path::PathBuf;
 use std::str;
 
+// Duplicated from syntax::ast for now
+type CrateConfig = FxHashSet<(Symbol, Option<Symbol>)>;
+
 /// Collected spans during parsing for places where a certain feature was
 /// used and should be feature gated accordingly in `check_crate`.
 #[derive(Default)]
@@ -137,7 +140,7 @@ pub fn source_map(&self) -> &SourceMap {
 
     pub fn buffer_lint(
         &self,
-        lint_id: &'static rustc_session::lint::Lint,
+        lint_id: &'static crate::lint::Lint,
         span: impl Into<MultiSpan>,
         id: NodeId,
         msg: &str,
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 3dcdd4db637..a94742634cf 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -102,7 +102,7 @@ pub mod feature_gate {
 pub mod show_span;
 pub use syntax_pos::edition;
 pub use syntax_pos::symbol;
-pub mod sess;
+pub use rustc_session::parse as sess;
 pub mod token;
 pub mod tokenstream;
 pub mod visit;
-- 
2.44.0