1. move node_id to syntax

2. invert rustc_session & syntax deps
3. drop rustc_session dep in rustc_hir

2 files changed, 5 insertions, 4 deletions

diff --git a/src/librustc_interface/interface.rs b/src/librustc_interface/interface.rs
index f491d662f97..ae758b5e327 100644
--- a/src/librustc_interface/interface.rs
+++ b/src/librustc_interface/interface.rs
@@ -14,13 +14,13 @@ use rustc_data_structures::OnDrop;
 use rustc_errors::registry::Registry;
 use rustc_lint::LintStore;
 use rustc_parse::new_parser_from_source_str;
+use rustc_session::parse::{CrateConfig, ParseSess};
 use rustc_span::edition;
 use rustc_span::source_map::{FileLoader, FileName, SourceMap};
 use std::path::PathBuf;
 use std::result;
 use std::sync::{Arc, Mutex};
-use syntax::ast::{self, MetaItemKind};
-use syntax::sess::ParseSess;
+use syntax::ast::MetaItemKind;
 use syntax::token;
 
 pub type Result<T> = result::Result<T, ErrorReported>;
@@ -106,7 +106,7 @@ pub fn parse_cfgspecs(cfgspecs: Vec<String>) -> FxHashSet<(String, Option<String
 
                 error!(r#"expected `key` or `key="value"`"#);
             })
-            .collect::<ast::CrateConfig>();
+            .collect::<CrateConfig>();
         cfg.into_iter().map(|(a, b)| (a.to_string(), b.map(|b| b.to_string()))).collect()
     })
 }
diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs
index 56121fba2d5..842b702be2a 100644
--- a/src/librustc_interface/util.rs
+++ b/src/librustc_interface/util.rs
@@ -14,6 +14,7 @@ use rustc_resolve::{self, Resolver};
 use rustc_session as session;
 use rustc_session::config::{ErrorOutputType, Input, OutputFilenames};
 use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer};
+use rustc_session::parse::CrateConfig;
 use rustc_session::CrateDisambiguator;
 use rustc_session::{config, early_error, filesearch, DiagnosticOutput, Session};
 use rustc_span::edition::Edition;
@@ -40,7 +41,7 @@ use syntax::{self, ast};
 /// This is performed by checking whether a whitelisted set of
 /// features is available on the target machine, by querying LLVM.
 pub fn add_configuration(
-    cfg: &mut ast::CrateConfig,
+    cfg: &mut CrateConfig,
     sess: &Session,
     codegen_backend: &dyn CodegenBackend,
 ) {