Move dataflow to borrowck

No one else uses it.

6 files changed, 15 insertions, 18 deletions

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 8e71df3c34b..bdf3c2ba496 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -134,7 +134,6 @@ pub mod middle {
     pub mod borrowck;
     pub mod expr_use_visitor;
     pub mod cstore;
-    pub mod dataflow;
     pub mod dead;
     pub mod dependency_format;
     pub mod entry;
diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs
index aef8b58fa8b..7c23fad45dd 100644
--- a/src/librustc_borrowck/borrowck/mod.rs
+++ b/src/librustc_borrowck/borrowck/mod.rs
@@ -24,10 +24,6 @@ use rustc::hir::HirId;
 use rustc::hir::map as hir_map;
 use rustc::hir::map::blocks::FnLikeNode;
 use rustc::cfg;
-use rustc::middle::dataflow::DataFlowContext;
-use rustc::middle::dataflow::BitwiseOperator;
-use rustc::middle::dataflow::DataFlowOperator;
-use rustc::middle::dataflow::KillFrom;
 use rustc::middle::borrowck::{BorrowCheckResult, SignalledError};
 use rustc::hir::def_id::{DefId, LocalDefId};
 use rustc::middle::expr_use_visitor as euv;
@@ -54,6 +50,8 @@ use errors::{DiagnosticBuilder, DiagnosticId};
 use rustc::hir;
 use rustc::hir::intravisit::{self, Visitor};
 
+use dataflow::{DataFlowContext, BitwiseOperator, DataFlowOperator, KillFrom};
+
 pub mod check_loans;
 
 pub mod gather_loans;
diff --git a/src/librustc_borrowck/borrowck/move_data.rs b/src/librustc_borrowck/borrowck/move_data.rs
index 4091ca046f4..6c380338327 100644
--- a/src/librustc_borrowck/borrowck/move_data.rs
+++ b/src/librustc_borrowck/borrowck/move_data.rs
@@ -13,12 +13,10 @@
 
 pub use self::MoveKind::*;
 
+use dataflow::{DataFlowContext, BitwiseOperator, DataFlowOperator, KillFrom};
+
 use borrowck::*;
 use rustc::cfg;
-use rustc::middle::dataflow::DataFlowContext;
-use rustc::middle::dataflow::BitwiseOperator;
-use rustc::middle::dataflow::DataFlowOperator;
-use rustc::middle::dataflow::KillFrom;
 use rustc::middle::expr_use_visitor as euv;
 use rustc::middle::expr_use_visitor::MutateMode;
 use rustc::ty::{self, TyCtxt};
diff --git a/src/librustc/middle/dataflow.rs b/src/librustc_borrowck/dataflow.rs
index b949fd02126..d5f30c1dcd4 100644
--- a/src/librustc/middle/dataflow.rs
+++ b/src/librustc_borrowck/dataflow.rs
@@ -14,9 +14,9 @@
 //! and thus uses bitvectors. Your job is simply to specify the so-called
 //! GEN and KILL bits for each expression.
 
-use cfg;
-use cfg::CFGIndex;
-use ty::TyCtxt;
+use rustc::cfg;
+use rustc::cfg::CFGIndex;
+use rustc::ty::TyCtxt;
 use std::io;
 use std::mem;
 use std::usize;
@@ -24,10 +24,10 @@ use syntax::print::pprust::PrintState;
 
 use rustc_data_structures::graph::implementation::OUTGOING;
 
-use util::nodemap::FxHashMap;
-use hir;
-use hir::intravisit::{self, IdRange};
-use hir::print as pprust;
+use rustc::util::nodemap::FxHashMap;
+use rustc::hir;
+use rustc::hir::intravisit::{self, IdRange};
+use rustc::hir::print as pprust;
 
 
 #[derive(Copy, Clone, Debug)]
@@ -193,7 +193,7 @@ fn build_local_id_to_index(body: Option<&hir::Body>,
     fn add_entries_from_fn_body(index: &mut FxHashMap<hir::ItemLocalId, Vec<CFGIndex>>,
                                 body: &hir::Body,
                                 entry: CFGIndex) {
-        use hir::intravisit::Visitor;
+        use rustc::hir::intravisit::Visitor;
 
         struct Formals<'a> {
             entry: CFGIndex,
diff --git a/src/librustc_borrowck/graphviz.rs b/src/librustc_borrowck/graphviz.rs
index 22867ba5b55..dddd6a354c1 100644
--- a/src/librustc_borrowck/graphviz.rs
+++ b/src/librustc_borrowck/graphviz.rs
@@ -21,7 +21,7 @@ use borrowck;
 use borrowck::{BorrowckCtxt, LoanPath};
 use dot;
 use rustc::cfg::CFGIndex;
-use rustc::middle::dataflow::{DataFlowOperator, DataFlowContext, EntryOrExit};
+use dataflow::{DataFlowOperator, DataFlowContext, EntryOrExit};
 use std::rc::Rc;
 use dot::IntoCow;
 
diff --git a/src/librustc_borrowck/lib.rs b/src/librustc_borrowck/lib.rs
index a5a20af0e4e..7bb76efd49c 100644
--- a/src/librustc_borrowck/lib.rs
+++ b/src/librustc_borrowck/lib.rs
@@ -39,4 +39,6 @@ mod borrowck;
 
 pub mod graphviz;
 
+mod dataflow;
+
 pub use borrowck::provide;