Auto merge of #67850 - GuillaumeGomez:err-codes-checkup, r=Mark-Simulacrum

[rust.git] / src / librustc_expand / tests.rs

diff --git a/src/librustc_expand/tests.rs b/src/librustc_expand/tests.rs
index 4f5ff97e48d23470d5d2193af787d21ddc4de7b0..82ab74ac1500493ee5040cc30d553e08e33e9a3f 100644 (file)
--- a/src/librustc_expand/tests.rs
+++ b/src/librustc_expand/tests.rs
@@ -1,14 +1,14 @@
 use rustc_parse::{new_parser_from_source_str, parser::Parser, source_file_to_stream};
+use rustc_span::source_map::{FilePathMapping, SourceMap};
+use rustc_span::{BytePos, MultiSpan, Span};
 use syntax::ast;
 use syntax::sess::ParseSess;
-use syntax::source_map::{FilePathMapping, SourceMap};
 use syntax::tokenstream::TokenStream;
 use syntax::with_default_globals;
-use syntax_pos::{BytePos, MultiSpan, Span};
 
-use errors::emitter::EmitterWriter;
-use errors::{Handler, PResult};
 use rustc_data_structures::sync::Lrc;
+use rustc_errors::emitter::EmitterWriter;
+use rustc_errors::{Handler, PResult};
 
 use std::io;
 use std::io::prelude::*;