X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_builtin_macros%2Fformat.rs;h=6fca74e22394465646dd5fda813fd02dbdf633e7;hb=72aaa3a414d17aa0c4f19feafa5bab5f84b60e63;hp=7b915a66dacc94d2442b222f01dca8ccb7464a98;hpb=529a42a1a6b6523e8376610556d9890479b9524c;p=rust.git

diff --git a/src/librustc_builtin_macros/format.rs b/src/librustc_builtin_macros/format.rs
index 7b915a66dac..6fca74e2239 100644
--- a/src/librustc_builtin_macros/format.rs
+++ b/src/librustc_builtin_macros/format.rs
@@ -3,19 +3,16 @@
 
 use fmt_macros as parse;
 
-use errors::pluralize;
-use errors::Applicability;
-use errors::DiagnosticBuilder;
-
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
 use rustc_expand::base::{self, *};
+use rustc_span::symbol::{sym, Symbol};
+use rustc_span::{MultiSpan, Span};
 use syntax::ast;
 use syntax::ptr::P;
-use syntax::symbol::{sym, Symbol};
 use syntax::token;
 use syntax::tokenstream::TokenStream;
-use syntax_pos::{MultiSpan, Span};
 
-use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
 use std::collections::hash_map::Entry;