-use syntax::edition::Edition;
+use rustc_expand::base::{ExtCtxt, Resolver};
+use rustc_expand::expand::ExpansionConfig;
+use rustc_span::edition::Edition;
+use rustc_span::hygiene::AstPass;
+use rustc_span::symbol::{kw, sym, Ident, Symbol};
+use rustc_span::DUMMY_SP;
use syntax::ptr::P;
use syntax::sess::ParseSess;
-use syntax::symbol::{kw, sym, Ident, Symbol};
use syntax::{ast, attr};
-use syntax_expand::base::{ExtCtxt, Resolver};
-use syntax_expand::expand::ExpansionConfig;
-use syntax_pos::hygiene::AstPass;
-use syntax_pos::DUMMY_SP;
pub fn inject(
mut krate: ast::Crate,