about summary refs log tree commit diff
path: root/src/libsyntax/util
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/util
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/util')
-rw-r--r--src/libsyntax/util/comments.rs2
-rw-r--r--src/libsyntax/util/literal.rs2
-rw-r--r--src/libsyntax/util/node_count.rs2
3 files changed, 3 insertions, 3 deletions
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,