Rename `syntax_pos` to `rustc_span` in source code

6 files changed, 8 insertions, 8 deletions

diff --git a/src/librustc_feature/Cargo.toml b/src/librustc_feature/Cargo.toml
index e9e3e471ce6..96fd15ef304 100644
--- a/src/librustc_feature/Cargo.toml
+++ b/src/librustc_feature/Cargo.toml
@@ -12,4 +12,4 @@ doctest = false
 [dependencies]
 rustc_data_structures = { path = "../librustc_data_structures" }
 lazy_static = "1.0.0"
-syntax_pos = { path = "../librustc_span", package = "rustc_span" }
+rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_feature/accepted.rs b/src/librustc_feature/accepted.rs
index 144a3faaba5..d880fc84b38 100644
--- a/src/librustc_feature/accepted.rs
+++ b/src/librustc_feature/accepted.rs
@@ -1,7 +1,7 @@
 //! List of the accepted feature gates.
 
 use super::{Feature, State};
-use syntax_pos::symbol::sym;
+use rustc_span::symbol::sym;
 
 macro_rules! declare_features {
     ($(
diff --git a/src/librustc_feature/active.rs b/src/librustc_feature/active.rs
index 708e48fe6ad..8cb1684491b 100644
--- a/src/librustc_feature/active.rs
+++ b/src/librustc_feature/active.rs
@@ -2,9 +2,9 @@
 
 use super::{Feature, State};
 
-use syntax_pos::edition::Edition;
-use syntax_pos::symbol::{sym, Symbol};
-use syntax_pos::Span;
+use rustc_span::edition::Edition;
+use rustc_span::symbol::{sym, Symbol};
+use rustc_span::Span;
 
 macro_rules! set {
     ($field: ident) => {{
diff --git a/src/librustc_feature/builtin_attrs.rs b/src/librustc_feature/builtin_attrs.rs
index 5ae87d9712d..3cbf96b6d29 100644
--- a/src/librustc_feature/builtin_attrs.rs
+++ b/src/librustc_feature/builtin_attrs.rs
@@ -7,7 +7,7 @@ use crate::{Features, Stability};
 
 use lazy_static::lazy_static;
 use rustc_data_structures::fx::FxHashMap;
-use syntax_pos::symbol::{sym, Symbol};
+use rustc_span::symbol::{sym, Symbol};
 
 type GateFn = fn(&Features) -> bool;
 
diff --git a/src/librustc_feature/lib.rs b/src/librustc_feature/lib.rs
index b85feee040c..71a46427925 100644
--- a/src/librustc_feature/lib.rs
+++ b/src/librustc_feature/lib.rs
@@ -15,9 +15,9 @@ mod active;
 mod builtin_attrs;
 mod removed;
 
+use rustc_span::{edition::Edition, symbol::Symbol, Span};
 use std::fmt;
 use std::num::NonZeroU32;
-use syntax_pos::{edition::Edition, symbol::Symbol, Span};
 
 #[derive(Clone, Copy)]
 pub enum State {
diff --git a/src/librustc_feature/removed.rs b/src/librustc_feature/removed.rs
index 5512e1247aa..1eeedd77214 100644
--- a/src/librustc_feature/removed.rs
+++ b/src/librustc_feature/removed.rs
@@ -1,7 +1,7 @@
 //! List of the removed feature gates.
 
 use super::{Feature, State};
-use syntax_pos::symbol::sym;
+use rustc_span::symbol::sym;
 
 macro_rules! declare_features {
     ($(