Skip to content

Commit 9e6fb53

Browse files
committed
Auto merge of #67763 - petrochenkov:crateren2, r=Centril
Rename `syntax_pos` to `rustc_span` in source code Follow-up to #67707. r? @Centril
2 parents 38aa6bd + 70f1d57 commit 9e6fb53

File tree

383 files changed

+601
-601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

383 files changed

+601
-601
lines changed

src/libfmt_macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ name = "fmt_macros"
99
path = "lib.rs"
1010

1111
[dependencies]
12-
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
12+
rustc_span = { path = "../librustc_span" }
1313
rustc_lexer = { path = "../librustc_lexer" }

src/libfmt_macros/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use std::iter;
2424
use std::str;
2525
use std::string;
2626

27-
use syntax_pos::{InnerSpan, Symbol};
27+
use rustc_span::{InnerSpan, Symbol};
2828

2929
#[derive(Copy, Clone)]
3030
struct InnerOffset(usize);

src/libfmt_macros/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ fn format_align_fill() {
144144
}
145145
#[test]
146146
fn format_counts() {
147-
use syntax_pos::{edition, Globals, GLOBALS};
147+
use rustc_span::{edition, Globals, GLOBALS};
148148
GLOBALS.set(&Globals::new(edition::DEFAULT_EDITION), || {
149149
same(
150150
"{:10x}",

src/librustc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rustc_index = { path = "../librustc_index" }
3030
errors = { path = "../librustc_errors", package = "rustc_errors" }
3131
rustc_serialize = { path = "../libserialize", package = "serialize" }
3232
syntax = { path = "../libsyntax" }
33-
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
33+
rustc_span = { path = "../librustc_span" }
3434
backtrace = "0.3.40"
3535
parking_lot = "0.9"
3636
byteorder = { version = "1.3" }

src/librustc/dep_graph/dep_node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ use crate::traits::query::{
6565
use crate::ty::subst::SubstsRef;
6666
use crate::ty::{self, ParamEnvAnd, Ty, TyCtxt};
6767
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
68+
use rustc_span::symbol::Symbol;
6869
use std::fmt;
6970
use std::hash::Hash;
70-
use syntax_pos::symbol::Symbol;
7171

7272
// erase!() just makes tokens go away. It's used to specify which macro argument
7373
// is repeated (i.e., which sub-expression of the macro we are in) but don't need

src/librustc/hir/check_attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ use crate::lint::builtin::UNUSED_ATTRIBUTES;
1212
use crate::ty::query::Providers;
1313
use crate::ty::TyCtxt;
1414

15+
use rustc_span::Span;
1516
use std::fmt::{self, Display};
1617
use syntax::{attr, symbol::sym};
17-
use syntax_pos::Span;
1818

1919
use rustc_error_codes::*;
2020

src/librustc/hir/def.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use crate::ty;
66
use crate::util::nodemap::DefIdMap;
77

88
use rustc_macros::HashStable;
9+
use rustc_span::hygiene::MacroKind;
10+
use rustc_span::Span;
911
use syntax::ast;
1012
use syntax::ast::NodeId;
11-
use syntax_pos::hygiene::MacroKind;
12-
use syntax_pos::Span;
1313

1414
use std::fmt::Debug;
1515

src/librustc/hir/intravisit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ use super::itemlikevisit::DeepVisitor;
3636
use crate::hir::map::Map;
3737
use crate::hir::*;
3838

39+
use rustc_span::Span;
3940
use syntax::ast::{Attribute, Ident, Name};
40-
use syntax_pos::Span;
4141

4242
#[derive(Copy, Clone)]
4343
pub enum FnKind<'a> {

src/librustc/hir/map/blocks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use crate::hir as ast;
1515
use crate::hir::intravisit::FnKind;
1616
use crate::hir::map;
1717
use crate::hir::{Expr, FnDecl, Node};
18+
use rustc_span::Span;
1819
use syntax::ast::{Attribute, Ident};
19-
use syntax_pos::Span;
2020

2121
/// An FnLikeNode is a Node that is like a fn, in that it has a decl
2222
/// and a body (as well as a NodeId, a span, etc).

src/librustc/hir/map/collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ use crate::session::Session;
1111
use crate::util::nodemap::FxHashMap;
1212
use rustc_data_structures::svh::Svh;
1313
use rustc_index::vec::IndexVec;
14+
use rustc_span::Span;
1415
use std::iter::repeat;
1516
use syntax::ast::NodeId;
1617
use syntax::source_map::SourceMap;
17-
use syntax_pos::Span;
1818

1919
use crate::ich::StableHashingContext;
2020
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};

0 commit comments

Comments
 (0)