Rename `syntax_pos` to `rustc_span` in source code

17 files changed, 44 insertions, 44 deletions

diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml
index de35f1744c1..2098656db98 100644
--- a/src/libsyntax/Cargo.toml
+++ b/src/libsyntax/Cargo.toml
@@ -15,7 +15,7 @@ rustc_serialize = { path = "../libserialize", package = "serialize" }
 log = "0.4"
 scoped-tls = "1.0"
 lazy_static = "1.0.0"
-syntax_pos = { path = "../librustc_span", package = "rustc_span" }
+rustc_span = { path = "../librustc_span" }
 errors = { path = "../librustc_errors", package = "rustc_errors" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_feature = { path = "../librustc_feature" }
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 0a2004a8229..7bf7ea0a424 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -22,15 +22,15 @@ pub use crate::util::parser::ExprPrecedence;
 pub use GenericArgs::*;
 pub use UnsafeSource::*;
 
-pub use syntax_pos::symbol::{Ident, Symbol as Name};
+pub use rustc_span::symbol::{Ident, Symbol as Name};
 
 use crate::ptr::P;
 use crate::source_map::{dummy_spanned, respan, Spanned};
 use crate::token::{self, DelimToken};
 use crate::tokenstream::{DelimSpan, TokenStream, TokenTree};
 
-use syntax_pos::symbol::{kw, sym, Symbol};
-use syntax_pos::{Span, DUMMY_SP};
+use rustc_span::symbol::{kw, sym, Symbol};
+use rustc_span::{Span, DUMMY_SP};
 
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::Lrc;
diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs
index bf64333830e..04c28dd5c5b 100644
--- a/src/libsyntax/attr/builtin.rs
+++ b/src/libsyntax/attr/builtin.rs
@@ -9,9 +9,9 @@ use crate::sess::ParseSess;
 use errors::{Applicability, Handler};
 use rustc_feature::{find_gated_cfg, is_builtin_attr_name, Features, GatedCfg};
 use rustc_macros::HashStable_Generic;
+use rustc_span::hygiene::Transparency;
+use rustc_span::{symbol::sym, symbol::Symbol, Span};
 use std::num::NonZeroU32;
-use syntax_pos::hygiene::Transparency;
-use syntax_pos::{symbol::sym, symbol::Symbol, Span};
 
 use rustc_error_codes::*;
 
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs
index 0cd300384f8..3102aa5dd28 100644
--- a/src/libsyntax/attr/mod.rs
+++ b/src/libsyntax/attr/mod.rs
@@ -21,7 +21,7 @@ use crate::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndJoint};
 use crate::GLOBALS;
 
 use log::debug;
-use syntax_pos::Span;
+use rustc_span::Span;
 
 use std::iter;
 use std::ops::DerefMut;
diff --git a/src/libsyntax/expand/allocator.rs b/src/libsyntax/expand/allocator.rs
index 7ab8e370926..fbeeb47c23e 100644
--- a/src/libsyntax/expand/allocator.rs
+++ b/src/libsyntax/expand/allocator.rs
@@ -1,6 +1,6 @@
 use crate::{ast, attr, visit};
-use syntax_pos::symbol::{sym, Symbol};
-use syntax_pos::Span;
+use rustc_span::symbol::{sym, Symbol};
+use rustc_span::Span;
 
 #[derive(Clone, Copy)]
 pub enum AllocatorKind {
diff --git a/src/libsyntax/expand/mod.rs b/src/libsyntax/expand/mod.rs
index 761dc2f5684..50df8fa39ed 100644
--- a/src/libsyntax/expand/mod.rs
+++ b/src/libsyntax/expand/mod.rs
@@ -1,7 +1,7 @@
 //! Definitions shared by macros / syntax extensions and e.g. librustc.
 
 use crate::ast::Attribute;
-use syntax_pos::symbol::sym;
+use rustc_span::symbol::sym;
 
 pub mod allocator;
 
diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs
index 6fd926f2048..e5635eaf1e9 100644
--- a/src/libsyntax/feature_gate/check.rs
+++ b/src/libsyntax/feature_gate/check.rs
@@ -17,7 +17,7 @@ use crate::visit::{self, FnKind, Visitor};
 use errors::{Applicability, DiagnosticBuilder, Handler};
 use log::debug;
 use rustc_data_structures::fx::FxHashMap;
-use syntax_pos::{MultiSpan, Span, DUMMY_SP};
+use rustc_span::{MultiSpan, Span, DUMMY_SP};
 
 use rustc_error_codes::*;
 
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 7b8819377e6..b537f16ffcd 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -21,7 +21,7 @@ use ast::AttrId;
 pub use errors;
 use rustc_data_structures::sync::Lock;
 use rustc_index::bit_set::GrowableBitSet;
-use syntax_pos::edition::Edition;
+use rustc_span::edition::Edition;
 
 #[macro_export]
 macro_rules! unwrap_or {
@@ -36,7 +36,7 @@ macro_rules! unwrap_or {
 pub struct Globals {
     used_attrs: Lock<GrowableBitSet<AttrId>>,
     known_attrs: Lock<GrowableBitSet<AttrId>>,
-    syntax_pos_globals: syntax_pos::Globals,
+    rustc_span_globals: rustc_span::Globals,
 }
 
 impl Globals {
@@ -46,7 +46,7 @@ impl Globals {
             // initiate the vectors with 0 bits. We'll grow them as necessary.
             used_attrs: Lock::new(GrowableBitSet::new_empty()),
             known_attrs: Lock::new(GrowableBitSet::new_empty()),
-            syntax_pos_globals: syntax_pos::Globals::new(edition),
+            rustc_span_globals: rustc_span::Globals::new(edition),
         }
     }
 }
@@ -56,7 +56,7 @@ where
     F: FnOnce() -> R,
 {
     let globals = Globals::new(edition);
-    GLOBALS.set(&globals, || syntax_pos::GLOBALS.set(&globals.syntax_pos_globals, f))
+    GLOBALS.set(&globals, || rustc_span::GLOBALS.set(&globals.rustc_span_globals, f))
 }
 
 pub fn with_default_globals<F, R>(f: F) -> R
@@ -87,7 +87,7 @@ pub mod util {
 pub mod ast;
 pub mod attr;
 pub mod expand;
-pub use syntax_pos::source_map;
+pub use rustc_span::source_map;
 pub mod entry;
 pub mod feature_gate {
     mod check;
@@ -97,8 +97,8 @@ pub mod mut_visit;
 pub mod ptr;
 pub mod show_span;
 pub use rustc_session::parse as sess;
-pub use syntax_pos::edition;
-pub use syntax_pos::symbol;
+pub use rustc_span::edition;
+pub use rustc_span::symbol;
 pub mod token;
 pub mod tokenstream;
 pub mod visit;
@@ -114,4 +114,4 @@ pub mod early_buffered_lints;
 /// Requirements for a `StableHashingContext` to be used in this crate.
 /// This is a hack to allow using the `HashStable_Generic` derive macro
 /// instead of implementing everything in librustc.
-pub trait HashStableContext: syntax_pos::HashStableContext {}
+pub trait HashStableContext: rustc_span::HashStableContext {}
diff --git a/src/libsyntax/mut_visit.rs b/src/libsyntax/mut_visit.rs
index f6817c713a4..965a6fcf23b 100644
--- a/src/libsyntax/mut_visit.rs
+++ b/src/libsyntax/mut_visit.rs
@@ -14,8 +14,8 @@ use crate::token::{self, Token};
 use crate::tokenstream::*;
 use crate::util::map_in_place::MapInPlace;
 
+use rustc_span::Span;
 use smallvec::{smallvec, Array, SmallVec};
-use syntax_pos::Span;
 
 use rustc_data_structures::sync::Lrc;
 use std::ops::DerefMut;
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index b1b667f03be..eaad3a18000 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -14,8 +14,8 @@ use crate::util::classify;
 use crate::util::comments;
 use crate::util::parser::{self, AssocOp, Fixity};
 
-use syntax_pos::{self, BytePos};
-use syntax_pos::{FileName, Span};
+use rustc_span::{self, BytePos};
+use rustc_span::{FileName, Span};
 
 use std::borrow::Cow;
 
@@ -71,7 +71,7 @@ impl<'a> Comments<'a> {
 
     pub fn trailing_comment(
         &mut self,
-        span: syntax_pos::Span,
+        span: rustc_span::Span,
         next_pos: Option<BytePos>,
     ) -> Option<comments::Comment> {
         if let Some(cmnt) = self.next() {
@@ -131,7 +131,7 @@ pub fn print_crate<'a>(
 
         // Currently, in Rust 2018 we don't have `extern crate std;` at the crate
         // root, so this is not needed, and actually breaks things.
-        if sess.edition == syntax_pos::edition::Edition::Edition2015 {
+        if sess.edition == rustc_span::edition::Edition::Edition2015 {
             // `#![no_std]`
             let no_std_meta = attr::mk_word_item(ast::Ident::with_dummy_span(sym::no_std));
             let fake_attr = attr::mk_attr_inner(no_std_meta);
@@ -799,7 +799,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
         self.end(); // Close the head-box.
     }
 
-    fn bclose_maybe_open(&mut self, span: syntax_pos::Span, close_box: bool) {
+    fn bclose_maybe_open(&mut self, span: rustc_span::Span, close_box: bool) {
         self.maybe_print_comment(span.hi());
         self.break_offset_if_not_bol(1, -(INDENT_UNIT as isize));
         self.word("}");
@@ -808,7 +808,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
         }
     }
 
-    fn bclose(&mut self, span: syntax_pos::Span) {
+    fn bclose(&mut self, span: rustc_span::Span) {
         self.bclose_maybe_open(span, true)
     }
 
@@ -896,7 +896,7 @@ impl<'a> State<'a> {
     crate fn commasep_cmnt<T, F, G>(&mut self, b: Breaks, elts: &[T], mut op: F, mut get_span: G)
     where
         F: FnMut(&mut State<'_>, &T),
-        G: FnMut(&T) -> syntax_pos::Span,
+        G: FnMut(&T) -> rustc_span::Span,
     {
         self.rbox(0, b);
         let len = elts.len();
@@ -1366,7 +1366,7 @@ impl<'a> State<'a> {
         enum_definition: &ast::EnumDef,
         generics: &ast::Generics,
         ident: ast::Ident,
-        span: syntax_pos::Span,
+        span: rustc_span::Span,
         visibility: &ast::Visibility,
     ) {
         self.head(visibility_qualified(visibility, "enum"));
@@ -1377,7 +1377,7 @@ impl<'a> State<'a> {
         self.print_variants(&enum_definition.variants, span)
     }
 
-    crate fn print_variants(&mut self, variants: &[ast::Variant], span: syntax_pos::Span) {
+    crate fn print_variants(&mut self, variants: &[ast::Variant], span: rustc_span::Span) {
         self.bopen();
         for v in variants {
             self.space_if_not_bol();
@@ -1422,7 +1422,7 @@ impl<'a> State<'a> {
         struct_def: &ast::VariantData,
         generics: &ast::Generics,
         ident: ast::Ident,
-        span: syntax_pos::Span,
+        span: rustc_span::Span,
         print_finalizer: bool,
     ) {
         self.print_ident(ident);
@@ -2701,8 +2701,8 @@ impl<'a> State<'a> {
         }
         let generics = ast::Generics {
             params: Vec::new(),
-            where_clause: ast::WhereClause { predicates: Vec::new(), span: syntax_pos::DUMMY_SP },
-            span: syntax_pos::DUMMY_SP,
+            where_clause: ast::WhereClause { predicates: Vec::new(), span: rustc_span::DUMMY_SP },
+            span: rustc_span::DUMMY_SP,
         };
         self.print_fn(
             decl,
@@ -2716,7 +2716,7 @@ impl<'a> State<'a> {
 
     crate fn maybe_print_trailing_comment(
         &mut self,
-        span: syntax_pos::Span,
+        span: rustc_span::Span,
         next_pos: Option<BytePos>,
     ) {
         if let Some(cmnts) = self.comments() {
diff --git a/src/libsyntax/print/pprust/tests.rs b/src/libsyntax/print/pprust/tests.rs
index 2a1a1ad58f1..07657e3061e 100644
--- a/src/libsyntax/print/pprust/tests.rs
+++ b/src/libsyntax/print/pprust/tests.rs
@@ -3,7 +3,7 @@ use super::*;
 use crate::ast;
 use crate::source_map;
 use crate::with_default_globals;
-use syntax_pos;
+use rustc_span;
 
 fn fun_to_string(
     decl: &ast::FnDecl,
@@ -36,7 +36,7 @@ fn test_fun_to_string() {
 
         let decl = ast::FnDecl {
             inputs: Vec::new(),
-            output: ast::FunctionRetTy::Default(syntax_pos::DUMMY_SP),
+            output: ast::FunctionRetTy::Default(rustc_span::DUMMY_SP),
         };
         let generics = ast::Generics::default();
         assert_eq!(
@@ -53,12 +53,12 @@ fn test_variant_to_string() {
 
         let var = ast::Variant {
             ident,
-            vis: source_map::respan(syntax_pos::DUMMY_SP, ast::VisibilityKind::Inherited),
+            vis: source_map::respan(rustc_span::DUMMY_SP, ast::VisibilityKind::Inherited),
             attrs: Vec::new(),
             id: ast::DUMMY_NODE_ID,
             data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),
             disr_expr: None,
-            span: syntax_pos::DUMMY_SP,
+            span: rustc_span::DUMMY_SP,
             is_placeholder: false,
         };
 
diff --git a/src/libsyntax/token.rs b/src/libsyntax/token.rs
index 2242fdc9ed7..9e63f849604 100644
--- a/src/libsyntax/token.rs
+++ b/src/libsyntax/token.rs
@@ -9,8 +9,8 @@ use crate::ptr::P;
 use crate::symbol::kw;
 use crate::tokenstream::TokenTree;
 
-use syntax_pos::symbol::Symbol;
-use syntax_pos::{self, Span, DUMMY_SP};
+use rustc_span::symbol::Symbol;
+use rustc_span::{self, Span, DUMMY_SP};
 
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::Lrc;
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs
index d9ea4a0137f..03e8fff247b 100644
--- a/src/libsyntax/tokenstream.rs
+++ b/src/libsyntax/tokenstream.rs
@@ -18,8 +18,8 @@ use crate::token::{self, DelimToken, Token, TokenKind};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::Lrc;
 use rustc_macros::HashStable_Generic;
+use rustc_span::{Span, DUMMY_SP};
 use smallvec::{smallvec, SmallVec};
-use syntax_pos::{Span, DUMMY_SP};
 
 use std::{iter, mem};
 
diff --git a/src/libsyntax/util/comments.rs b/src/libsyntax/util/comments.rs
index 1d2b753b69a..7f22355bd1d 100644
--- a/src/libsyntax/util/comments.rs
+++ b/src/libsyntax/util/comments.rs
@@ -4,7 +4,7 @@ use crate::ast;
 use crate::sess::ParseSess;
 use crate::source_map::SourceMap;
 
-use syntax_pos::{BytePos, CharPos, FileName, Pos};
+use rustc_span::{BytePos, CharPos, FileName, Pos};
 
 use std::usize;
 
diff --git a/src/libsyntax/util/literal.rs b/src/libsyntax/util/literal.rs
index 27ce180a4bc..3b156e03d3e 100644
--- a/src/libsyntax/util/literal.rs
+++ b/src/libsyntax/util/literal.rs
@@ -10,7 +10,7 @@ use rustc_data_structures::sync::Lrc;
 use rustc_lexer::unescape::{unescape_byte, unescape_char};
 use rustc_lexer::unescape::{unescape_byte_str, unescape_str};
 use rustc_lexer::unescape::{unescape_raw_byte_str, unescape_raw_str};
-use syntax_pos::Span;
+use rustc_span::Span;
 
 use std::ascii;
 
diff --git a/src/libsyntax/util/node_count.rs b/src/libsyntax/util/node_count.rs
index e768ab4c648..39f978ce98c 100644
--- a/src/libsyntax/util/node_count.rs
+++ b/src/libsyntax/util/node_count.rs
@@ -2,7 +2,7 @@
 
 use crate::ast::*;
 use crate::visit::*;
-use syntax_pos::Span;
+use rustc_span::Span;
 
 pub struct NodeCounter {
     pub count: usize,
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index fbc5d133249..ebb49abebb0 100644
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -17,7 +17,7 @@ use crate::ast::*;
 use crate::token::Token;
 use crate::tokenstream::{TokenStream, TokenTree};
 
-use syntax_pos::Span;
+use rustc_span::Span;
 
 #[derive(Copy, Clone)]
 pub enum FnKind<'a> {