about summary refs log tree commit diff
path: root/src/librustc_parse/parser/expr.rs
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/librustc_parse/parser/expr.rs
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/librustc_parse/parser/expr.rs')
-rw-r--r--src/librustc_parse/parser/expr.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_parse/parser/expr.rs b/src/librustc_parse/parser/expr.rs
index ab7c156e370..90f15375aec 100644
--- a/src/librustc_parse/parser/expr.rs
+++ b/src/librustc_parse/parser/expr.rs
@@ -5,6 +5,8 @@ use super::{SemiColonMode, SeqSep, TokenExpectType};
 use crate::maybe_recover_from_interpolated_ty_qpath;
 
 use rustc_errors::{Applicability, PResult};
+use rustc_span::source_map::{self, Span};
+use rustc_span::symbol::{kw, sym, Symbol};
 use std::mem;
 use syntax::ast::{self, AttrStyle, AttrVec, CaptureBy, Field, Ident, Lit, DUMMY_NODE_ID};
 use syntax::ast::{
@@ -17,8 +19,6 @@ use syntax::token::{self, Token, TokenKind};
 use syntax::util::classify;
 use syntax::util::literal::LitError;
 use syntax::util::parser::{prec_let_scrutinee_needs_par, AssocOp, Fixity};
-use syntax_pos::source_map::{self, Span};
-use syntax_pos::symbol::{kw, sym, Symbol};
 
 /// Possibly accepts an `token::Interpolated` expression (a pre-parsed expression
 /// dropped into the token stream, which happens while parsing the result of