Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix imports
  • Loading branch information
mark-i-m committed Dec 4, 2019
1 parent 4917bba commit fbf4731
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
Expand Up @@ -19,15 +19,17 @@ 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,
borrow_set::BorrowData,
MirBorrowckCtxt, InitializationRequiringAction, PrefixSet
};

use super::{IncludingDowncast, UseSpans};
use super::{
IncludingDowncast, UseSpans,
explain_borrow::BorrowExplanation,
};

#[derive(Debug)]
struct MoveSite {
Expand Down
3 changes: 1 addition & 2 deletions 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};
Expand All @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions src/librustc_mir/borrow_check/diagnostics/mod.rs
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion src/librustc_mir/borrow_check/nll/mod.rs
Expand Up @@ -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;
Expand Down

0 comments on commit fbf4731

Please sign in to comment.