nix syntax::errors & prefer rustc_errors over errors

[rust.git] / src / librustc_parse / config.rs

diff --git a/src/librustc_parse/config.rs b/src/librustc_parse/config.rs
index 1ff2003e82ce0d8af7806abb8a2ef27510b93592..f2ffd9470ed7601908ae67a145307a6e31329e40 100644 (file)
--- a/src/librustc_parse/config.rs
+++ b/src/librustc_parse/config.rs
@@ -1,7 +1,7 @@
 //! Process the potential `cfg` attributes on a module.
 //! Also determine if the module should be included in this configuration.
 //!
-//! This module properly belongs in syntax_expand, but for now it's tied into
+//! This module properly belongs in rustc_expand, but for now it's tied into
 //! parsing, so we leave it here to avoid complicated out-of-line dependencies.
 //!
 //! A principled solution to this wrong location would be to implement [#64197].
@@ -11,17 +11,17 @@
 use crate::{parse_in, validate_attr};
 use rustc_errors::Applicability;
 use rustc_feature::Features;
+use rustc_span::edition::Edition;
+use rustc_span::symbol::sym;
+use rustc_span::Span;
 use syntax::ast::{self, AttrItem, Attribute, MetaItem};
 use syntax::attr;
 use syntax::attr::HasAttrs;
-use syntax::edition::Edition;
 use syntax::feature_gate::{feature_err, get_features};
 use syntax::mut_visit::*;
 use syntax::ptr::P;
 use syntax::sess::ParseSess;
 use syntax::util::map_in_place::MapInPlace;
-use syntax_pos::symbol::sym;
-use syntax_pos::Span;
 
 use smallvec::SmallVec;