From f28a4e93b44aeaacdc9c03d50f6c9986aa998ba2 Mon Sep 17 00:00:00 2001
From: Michael Woerister <michaelwoerister@posteo.net>
Date: Tue, 24 Nov 2015 14:35:34 +0100
Subject: [PATCH] Also move the MIR visitor to librustc.

---
 src/librustc/lib.rs                         | 1 +
 src/{librustc_mir => librustc/mir}/visit.rs | 4 ++--
 src/librustc_mir/lib.rs                     | 1 -
 src/librustc_trans/trans/mir/analyze.rs     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{librustc_mir => librustc/mir}/visit.rs (99%)

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index d75a4495a0eb..8b69767eee0e 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -139,6 +139,7 @@ pub mod middle {
 pub mod mir {
     pub mod repr;
     pub mod tcx;
+    pub mod visit;
 }
 
 pub mod session;
diff --git a/src/librustc_mir/visit.rs b/src/librustc/mir/visit.rs
similarity index 99%
rename from src/librustc_mir/visit.rs
rename to src/librustc/mir/visit.rs
index bef1850d3c5e..ac4f54b4b496 100644
--- a/src/librustc_mir/visit.rs
+++ b/src/librustc/mir/visit.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use rustc::middle::ty::Region;
-use rustc::mir::repr::*;
+use middle::ty::Region;
+use mir::repr::*;
 
 pub trait Visitor<'tcx> {
     // Override these, and call `self.super_xxx` to revert back to the
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index a3110df9ae46..710d5ba4b436 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -34,5 +34,4 @@ pub mod mir_map;
 mod hair;
 mod graphviz;
 pub mod transform;
-pub mod visit;
 
diff --git a/src/librustc_trans/trans/mir/analyze.rs b/src/librustc_trans/trans/mir/analyze.rs
index c3e6e0ff56bc..9d4c7663cb0d 100644
--- a/src/librustc_trans/trans/mir/analyze.rs
+++ b/src/librustc_trans/trans/mir/analyze.rs
@@ -13,7 +13,7 @@
 
 use rustc_data_structures::fnv::FnvHashSet;
 use rustc::mir::repr as mir;
-use rustc_mir::visit::{Visitor, LvalueContext};
+use rustc::mir::visit::{Visitor, LvalueContext};
 use trans::common::{self, Block};
 use super::rvalue;