about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo.net>2015-11-24 14:35:34 +0100
committerMichael Woerister <michaelwoerister@posteo.net>2015-11-30 10:03:33 +0100
commitf28a4e93b44aeaacdc9c03d50f6c9986aa998ba2 (patch)
tree68b473aded71c194511dabd87cf67285cee81c1d /src
parentbbe1d28496c194afce54f5a2c3a83140bf4bb3a7 (diff)
downloadrust-f28a4e93b44aeaacdc9c03d50f6c9986aa998ba2.tar.gz
rust-f28a4e93b44aeaacdc9c03d50f6c9986aa998ba2.zip
Also move the MIR visitor to librustc.
Diffstat (limited to 'src')
-rw-r--r--src/librustc/lib.rs1
-rw-r--r--src/librustc/mir/visit.rs (renamed from src/librustc_mir/visit.rs)4
-rw-r--r--src/librustc_mir/lib.rs1
-rw-r--r--src/librustc_trans/trans/mir/analyze.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index d75a4495a0e..8b69767eee0 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
index bef1850d3c5..ac4f54b4b49 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 a3110df9ae4..710d5ba4b43 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 c3e6e0ff56b..9d4c7663cb0 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;