about summary refs log tree commit diff
path: root/src/libsyntax/attr
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-01 08:39:44 +0000
committerbors <bors@rust-lang.org>2020-01-01 08:39:44 +0000
commit9e6fb538f9254884ca9f958fdce413d6c3f2016c (patch)
treeed077cbfc27cfa99565965681f03138285b1cb00 /src/libsyntax/attr
parent38aa6bdfd705ea0604d7d5dd9fabc5e8f853a4fc (diff)
parent70f1d57048d2c73c8c018d0d65ceb0e2ca5d9dae (diff)
downloadrust-9e6fb538f9254884ca9f958fdce413d6c3f2016c.tar.gz
rust-9e6fb538f9254884ca9f958fdce413d6c3f2016c.zip
Auto merge of #67763 - petrochenkov:crateren2, r=Centril
Rename `syntax_pos` to `rustc_span` in source code

Follow-up to https://github.com/rust-lang/rust/pull/67707.

r? @Centril
Diffstat (limited to 'src/libsyntax/attr')
-rw-r--r--src/libsyntax/attr/builtin.rs4
-rw-r--r--src/libsyntax/attr/mod.rs2
2 files changed, 3 insertions, 3 deletions
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;