diff options
| author | bors <bors@rust-lang.org> | 2020-01-01 08:39:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-01 08:39:44 +0000 |
| commit | 9e6fb538f9254884ca9f958fdce413d6c3f2016c (patch) | |
| tree | ed077cbfc27cfa99565965681f03138285b1cb00 /src/librustc_errors/lib.rs | |
| parent | 38aa6bdfd705ea0604d7d5dd9fabc5e8f853a4fc (diff) | |
| parent | 70f1d57048d2c73c8c018d0d65ceb0e2ca5d9dae (diff) | |
| download | rust-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_errors/lib.rs')
| -rw-r--r-- | src/librustc_errors/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index 53a673714a9..aa2865a75f9 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -18,8 +18,8 @@ use rustc_data_structures::fx::{FxHashSet, FxIndexMap}; use rustc_data_structures::stable_hasher::StableHasher; use rustc_data_structures::sync::{self, Lock, Lrc}; use rustc_data_structures::AtomicRef; -use syntax_pos::source_map::SourceMap; -use syntax_pos::{Loc, MultiSpan, Span}; +use rustc_span::source_map::SourceMap; +use rustc_span::{Loc, MultiSpan, Span}; use std::borrow::Cow; use std::panic; @@ -146,7 +146,7 @@ impl CodeSuggestion { /// Returns the assembled code suggestions, whether they should be shown with an underline /// and whether the substitution only differs in capitalization. pub fn splice_lines(&self, cm: &SourceMap) -> Vec<(String, Vec<SubstitutionPart>, bool)> { - use syntax_pos::{CharPos, Pos}; + use rustc_span::{CharPos, Pos}; fn push_trailing( buf: &mut String, @@ -240,7 +240,7 @@ impl CodeSuggestion { } } -pub use syntax_pos::fatal_error::{FatalError, FatalErrorMarker}; +pub use rustc_span::fatal_error::{FatalError, FatalErrorMarker}; /// Signifies that the compiler died with an explicit call to `.bug` /// or `.span_bug` rather than a failed assertion, etc. |
