From 22b2781fa5943647c7e9cbc0809e8ec5662e5dca Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Tue, 24 Mar 2020 04:59:39 +0100
Subject: [PATCH] {rustc::hir::map -> rustc_passes}::hir_id_validator

---
 src/librustc/hir/map/mod.rs                                   | 2 --
 src/librustc_interface/passes.rs                              | 2 +-
 src/{librustc/hir/map => librustc_passes}/hir_id_validator.rs | 4 ++--
 src/librustc_passes/lib.rs                                    | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename src/{librustc/hir/map => librustc_passes}/hir_id_validator.rs (99%)

diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index eb8e57743b8f..b80bd46318d1 100644
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -23,8 +23,6 @@ use rustc_target::spec::abi::Abi;
 
 pub mod blocks;
 mod collector;
-mod hir_id_validator;
-pub use hir_id_validator::check_crate;
 
 /// Represents an entry and its parent `HirId`.
 #[derive(Copy, Clone, Debug)]
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index 60bb4a661fd0..f927e6574f68 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -776,7 +776,7 @@ pub fn create_global_ctxt<'tcx>(
 fn analysis(tcx: TyCtxt<'_>, cnum: CrateNum) -> Result<()> {
     assert_eq!(cnum, LOCAL_CRATE);
 
-    rustc::hir::map::check_crate(tcx);
+    rustc_passes::hir_id_validator::check_crate(tcx);
 
     let sess = tcx.sess;
     let mut entry_point = None;
diff --git a/src/librustc/hir/map/hir_id_validator.rs b/src/librustc_passes/hir_id_validator.rs
similarity index 99%
rename from src/librustc/hir/map/hir_id_validator.rs
rename to src/librustc_passes/hir_id_validator.rs
index e3386a2a910e..a78e45eebbed 100644
--- a/src/librustc/hir/map/hir_id_validator.rs
+++ b/src/librustc_passes/hir_id_validator.rs
@@ -1,5 +1,5 @@
-use crate::hir::map::Map;
-use crate::ty::TyCtxt;
+use rustc::hir::map::Map;
+use rustc::ty::TyCtxt;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::{par_iter, Lock, ParallelIterator};
 use rustc_hir as hir;
diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs
index afafbacb8fa8..ab978edb8c3d 100644
--- a/src/librustc_passes/lib.rs
+++ b/src/librustc_passes/lib.rs
@@ -21,6 +21,7 @@ mod check_const;
 pub mod dead;
 mod diagnostic_items;
 pub mod entry;
+pub mod hir_id_validator;
 pub mod hir_stats;
 mod intrinsicck;
 mod lang_items;