From fbf4731778875304151a5e201162cdd8634896c3 Mon Sep 17 00:00:00 2001
From: Mark Mansi <markm@cs.wisc.edu>
Date: Wed, 27 Nov 2019 11:45:05 -0600
Subject: [PATCH] fix imports

---
 .../borrow_check/diagnostics/conflict_errors.rs             | 6 ++++--
 src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs | 3 +--
 src/librustc_mir/borrow_check/diagnostics/mod.rs            | 3 +++
 src/librustc_mir/borrow_check/nll/mod.rs                    | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs b/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
index 240077d744075..3d475c055f7b8 100644
--- a/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
@@ -19,7 +19,6 @@ use crate::dataflow::indexes::{MovePathIndex, MoveOutIndex};
 use crate::util::borrowck_errors;
 
 use crate::borrow_check::{
-    nll::explain_borrow::BorrowExplanation,
     nll::region_infer::{RegionName, RegionNameSource},
     prefixes::IsPrefixOf,
     WriteKind,
@@ -27,7 +26,10 @@ use crate::borrow_check::{
     MirBorrowckCtxt, InitializationRequiringAction, PrefixSet
 };
 
-use super::{IncludingDowncast, UseSpans};
+use super::{
+    IncludingDowncast, UseSpans,
+    explain_borrow::BorrowExplanation,
+};
 
 #[derive(Debug)]
 struct MoveSite {
diff --git a/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs b/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
index 46d5e8d4a900b..f1e2ebbd6895c 100644
--- a/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
@@ -1,7 +1,6 @@
 use std::collections::VecDeque;
 
 use crate::borrow_check::borrow_set::BorrowData;
-use crate::borrow_check::diagnostics::UseSpans;
 use crate::borrow_check::nll::region_infer::{Cause, RegionName};
 use crate::borrow_check::nll::ConstraintDescription;
 use crate::borrow_check::{MirBorrowckCtxt, WriteKind};
@@ -17,7 +16,7 @@ use rustc_errors::DiagnosticBuilder;
 use syntax_pos::Span;
 use syntax_pos::symbol::Symbol;
 
-mod find_use;
+use super::{UseSpans, find_use};
 
 #[derive(Debug)]
 pub(in crate::borrow_check) enum BorrowExplanation {
diff --git a/src/librustc_mir/borrow_check/diagnostics/mod.rs b/src/librustc_mir/borrow_check/diagnostics/mod.rs
index c4ad63d7bb81c..87bcf78b4ec3f 100644
--- a/src/librustc_mir/borrow_check/diagnostics/mod.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/mod.rs
@@ -19,9 +19,12 @@ use super::borrow_set::BorrowData;
 use super::MirBorrowckCtxt;
 use crate::dataflow::move_paths::{InitLocation, LookupResult};
 
+mod find_use;
+
 crate mod conflict_errors;
 crate mod move_errors;
 crate mod mutability_errors;
+crate mod explain_borrow;
 
 pub(super) struct IncludingDowncast(pub(super) bool);
 
diff --git a/src/librustc_mir/borrow_check/nll/mod.rs b/src/librustc_mir/borrow_check/nll/mod.rs
index 16182fe24fa4f..d27aa60297b84 100644
--- a/src/librustc_mir/borrow_check/nll/mod.rs
+++ b/src/librustc_mir/borrow_check/nll/mod.rs
@@ -32,7 +32,6 @@ use crate::util as mir_util;
 use crate::util::pretty;
 
 mod constraint_generation;
-pub mod explain_borrow;
 mod facts;
 mod invalidation;
 crate mod region_infer;