rebase over the hir rename

src/librustc/dep_graph/visit.rs

@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use hir;
 use hir::def_id::DefId;
+use hir::intravisit::Visitor;
 use ty::TyCtxt;
-use rustc_front::hir;
-use rustc_front::intravisit::Visitor;
 
 use super::dep_node::DepNode;
 

src/librustc/middle/cstore.rs

@@ -28,7 +28,6 @@ use hir::def::{self, Def};
 use middle::lang_items;
 use ty::{self, Ty, TyCtxt, VariantKind};
 use hir::def_id::{DefId, DefIndex};
-use hir::svh::Svh;
 use mir::repr::Mir;
 use mir::mir_map::MirMap;
 use session::Session;

src/librustc_incremental/calculate_svh.rs

@@ -15,7 +15,7 @@ use std::hash::{Hash, SipHasher, Hasher};
 use rustc::hir::def_id::{CRATE_DEF_INDEX, DefId};
 use rustc::hir::svh::Svh;
 use rustc::ty;
-use rustc_front::intravisit::{self, Visitor};
+use rustc::hir::intravisit::{self, Visitor};
 
 use self::svh_visitor::StrictVersionHashVisitor;
 
@@ -110,10 +110,10 @@ mod svh_visitor {
     use syntax::codemap::Span;
     use syntax::parse::token;
     use rustc::ty;
-    use rustc_front::intravisit as visit;
-    use rustc_front::intravisit::{Visitor, FnKind};
-    use rustc_front::hir::*;
-    use rustc_front::hir;
+    use rustc::hir;
+    use rustc::hir::*;
+    use rustc::hir::intravisit as visit;
+    use rustc::hir::intravisit::{Visitor, FnKind};
 
     use std::hash::{Hash, SipHasher};
 

src/librustc_incremental/persist/directory.rs

@@ -14,8 +14,8 @@
 //! item might even be removed in the meantime).
 
 use rustc::dep_graph::DepNode;
-use rustc::front::map::DefPath;
-use rustc::middle::def_id::DefId;
+use rustc::hir::map::DefPath;
+use rustc::hir::def_id::DefId;
 use rustc::ty;
 use rustc::util::nodemap::DefIdMap;
 use rustc_serialize::{Decoder as RustcDecoder,

src/librustc_incremental/persist/dirty_clean.rs

@@ -25,9 +25,9 @@
 //! the required condition is not met.
 
 use rustc::dep_graph::{DepGraphQuery, DepNode};
-use rustc::middle::def_id::DefId;
-use rustc_front::hir;
-use rustc_front::intravisit::Visitor;
+use rustc::hir;
+use rustc::hir::def_id::DefId;
+use rustc::hir::intravisit::Visitor;
 use syntax::ast::{self, Attribute, MetaItem};
 use syntax::attr::AttrMetaMethods;
 use syntax::parse::token::InternedString;

src/librustc_incremental/persist/load.rs

@@ -14,7 +14,7 @@ use calculate_svh::SvhCalculate;
 use rbml::Error;
 use rbml::opaque::Decoder;
 use rustc::dep_graph::DepNode;
-use rustc::middle::def_id::DefId;
+use rustc::hir::def_id::DefId;
 use rustc::ty;
 use rustc_data_structures::fnv::FnvHashSet;
 use rustc_serialize::Decodable as RustcDecodable;

src/librustc_trans/back/link.rs

@@ -44,8 +44,6 @@ use syntax::ast;
 use syntax::codemap::Span;
 use syntax::attr::AttrMetaMethods;
 
-use rustc::hir;
-
 // RLIB LLVM-BYTECODE OBJECT LAYOUT
 // Version 1
 // Bytes    Data