diff options
| author | Douglas Campos <qmx@qmx.me> | 2017-09-28 08:36:34 -0400 |
|---|---|---|
| committer | Douglas Campos <qmx@qmx.me> | 2017-09-29 22:34:48 -0400 |
| commit | 29220663c14e7e52db8dc5eb796ace22f5b3591b (patch) | |
| tree | bb2dbe203e4a7a694b4af96402596f5647a51b6d | |
| parent | 081b29c1f69171c092b4c73ef4d1a04bab4f85dd (diff) | |
| download | rust-29220663c14e7e52db8dc5eb796ace22f5b3591b.tar.gz rust-29220663c14e7e52db8dc5eb796ace22f5b3591b.zip | |
style fixes as requested by @eddyb
| -rw-r--r-- | src/librustc/ty/instance.rs | 2 | ||||
| -rw-r--r-- | src/librustc_trans/callee.rs | 6 | ||||
| -rw-r--r-- | src/librustc_trans/mir/block.rs | 6 | ||||
| -rw-r--r-- | src/librustc_trans/mir/constant.rs | 6 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/librustc/ty/instance.rs b/src/librustc/ty/instance.rs index dbdca1266af..6f1be020c7b 100644 --- a/src/librustc/ty/instance.rs +++ b/src/librustc/ty/instance.rs @@ -165,8 +165,6 @@ impl<'a, 'b, 'tcx> Instance<'tcx> { debug!("resolve(def_id={:?}, substs={:?}) = {:?}", def_id, substs, result); result } - - } fn resolve_closure<'a, 'tcx>( diff --git a/src/librustc_trans/callee.rs b/src/librustc_trans/callee.rs index 5231a516f62..c5a754719a1 100644 --- a/src/librustc_trans/callee.rs +++ b/src/librustc_trans/callee.rs @@ -181,7 +181,7 @@ pub fn resolve_and_get_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>, -> ValueRef { get_fn(ccx, ty::Instance::resolve(ccx.tcx(), - ty::ParamEnv::empty(traits::Reveal::All), - def_id, - substs).unwrap()) + ty::ParamEnv::empty(traits::Reveal::All), + def_id, + substs).unwrap()) } diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs index 6e27c0dafaf..591aa974666 100644 --- a/src/librustc_trans/mir/block.rs +++ b/src/librustc_trans/mir/block.rs @@ -431,9 +431,9 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> { let (instance, mut llfn) = match callee.ty.sty { ty::TyFnDef(def_id, substs) => { (Some(ty::Instance::resolve(bcx.ccx.tcx(), - ty::ParamEnv::empty(traits::Reveal::All), - def_id, - substs).unwrap()), + ty::ParamEnv::empty(traits::Reveal::All), + def_id, + substs).unwrap()), None) } ty::TyFnPtr(_) => { diff --git a/src/librustc_trans/mir/constant.rs b/src/librustc_trans/mir/constant.rs index 1ccf6d25620..1b8e68f691a 100644 --- a/src/librustc_trans/mir/constant.rs +++ b/src/librustc_trans/mir/constant.rs @@ -262,9 +262,9 @@ impl<'a, 'tcx> MirConstContext<'a, 'tcx> { args: IndexVec<mir::Local, Result<Const<'tcx>, ConstEvalErr<'tcx>>>) -> Result<Const<'tcx>, ConstEvalErr<'tcx>> { let instance = ty::Instance::resolve(ccx.tcx(), - ty::ParamEnv::empty(traits::Reveal::All), - def_id, - substs).unwrap(); + ty::ParamEnv::empty(traits::Reveal::All), + def_id, + substs).unwrap(); let mir = ccx.tcx().instance_mir(instance.def); MirConstContext::new(ccx, &mir, instance.substs, args).trans() } |