Move DefPathHashes to rustc::ich

src/librustc/ich/def_path_hash.rs

@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use rustc::hir::def_id::DefId;
-use rustc::ty::TyCtxt;
-use rustc::util::nodemap::DefIdMap;
+use hir::def_id::DefId;
+use ty::TyCtxt;
+use util::nodemap::DefIdMap;
 
 pub struct DefPathHashes<'a, 'tcx: 'a> {
     tcx: TyCtxt<'a, 'tcx, 'tcx>,

src/librustc/ich/mod.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 pub use self::fingerprint::Fingerprint;
+pub use self::def_path_hash::DefPathHashes;
 
 mod fingerprint;
-
+mod def_path_hash;

src/librustc_incremental/calculate_svh/mod.rs

@@ -35,18 +35,16 @@ use rustc::hir;
 use rustc::hir::def_id::{CRATE_DEF_INDEX, DefId};
 use rustc::hir::intravisit as visit;
 use rustc::hir::intravisit::{Visitor, NestedVisitorMap};
-use rustc::ich::Fingerprint;
+use rustc::ich::{Fingerprint, DefPathHashes};
 use rustc::ty::TyCtxt;
 use rustc_data_structures::stable_hasher::StableHasher;
 use rustc_data_structures::fx::FxHashMap;
 use rustc::util::common::record_time;
 use rustc::session::config::DebugInfoLevel::NoDebugInfo;
 
-use self::def_path_hash::DefPathHashes;
 use self::svh_visitor::StrictVersionHashVisitor;
 use self::caching_codemap_view::CachingCodemapView;
 
-mod def_path_hash;
 mod svh_visitor;
 mod caching_codemap_view;
 

src/librustc_incremental/calculate_svh/svh_visitor.rs

@@ -26,10 +26,10 @@ use rustc::hir::*;
 use rustc::hir::def::Def;
 use rustc::hir::def_id::DefId;
 use rustc::hir::intravisit::{self as visit, Visitor};
+use rustc::ich::DefPathHashes;
 use rustc::ty::TyCtxt;
 use std::hash::{Hash, Hasher};
 
-use super::def_path_hash::DefPathHashes;
 use super::caching_codemap_view::CachingCodemapView;
 use super::IchHasher;