diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-05-15 17:58:58 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-05-22 15:54:16 -0400 |
| commit | 697146bf406deaa790915da346b6188220e562be (patch) | |
| tree | d0903b471702e2016b9da1c045aac478dbefa7f2 /src/librustc_borrowck | |
| parent | 226358e2fb2541678c21bdddc603311863a5ab93 (diff) | |
| download | rust-697146bf406deaa790915da346b6188220e562be.tar.gz rust-697146bf406deaa790915da346b6188220e562be.zip | |
use `ParamEnv` from `ty` rather than importing
Diffstat (limited to 'src/librustc_borrowck')
| -rw-r--r-- | src/librustc_borrowck/borrowck/mir/gather_moves.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_borrowck/borrowck/mir/gather_moves.rs b/src/librustc_borrowck/borrowck/mir/gather_moves.rs index cf56a705839..931cdf4f686 100644 --- a/src/librustc_borrowck/borrowck/mir/gather_moves.rs +++ b/src/librustc_borrowck/borrowck/mir/gather_moves.rs @@ -9,7 +9,7 @@ // except according to those terms. -use rustc::ty::{self, TyCtxt, ParamEnv}; +use rustc::ty::{self, TyCtxt}; use rustc::mir::*; use rustc::util::nodemap::FxHashMap; use rustc_data_structures::indexed_vec::{IndexVec}; @@ -191,7 +191,7 @@ pub struct MovePathLookup<'tcx> { struct MoveDataBuilder<'a, 'tcx: 'a> { mir: &'a Mir<'tcx>, tcx: TyCtxt<'a, 'tcx, 'tcx>, - param_env: ParamEnv<'tcx>, + param_env: ty::ParamEnv<'tcx>, data: MoveData<'tcx>, } @@ -203,7 +203,7 @@ pub enum MovePathError { impl<'a, 'tcx> MoveDataBuilder<'a, 'tcx> { fn new(mir: &'a Mir<'tcx>, tcx: TyCtxt<'a, 'tcx, 'tcx>, - param_env: ParamEnv<'tcx>) + param_env: ty::ParamEnv<'tcx>) -> Self { let mut move_paths = IndexVec::new(); let mut path_map = IndexVec::new(); @@ -370,7 +370,7 @@ impl<'tcx> MovePathLookup<'tcx> { impl<'a, 'tcx> MoveData<'tcx> { pub fn gather_moves(mir: &Mir<'tcx>, tcx: TyCtxt<'a, 'tcx, 'tcx>, - param_env: ParamEnv<'tcx>) + param_env: ty::ParamEnv<'tcx>) -> Self { gather_moves(mir, tcx, param_env) } @@ -378,7 +378,7 @@ impl<'a, 'tcx> MoveData<'tcx> { fn gather_moves<'a, 'tcx>(mir: &Mir<'tcx>, tcx: TyCtxt<'a, 'tcx, 'tcx>, - param_env: ParamEnv<'tcx>) + param_env: ty::ParamEnv<'tcx>) -> MoveData<'tcx> { let mut builder = MoveDataBuilder::new(mir, tcx, param_env); |
