Skip to content

Commit 2922066

Browse files
committed
style fixes as requested by @eddyb
1 parent 081b29c commit 2922066

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

src/librustc/ty/instance.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ impl<'a, 'b, 'tcx> Instance<'tcx> {
165165
debug!("resolve(def_id={:?}, substs={:?}) = {:?}", def_id, substs, result);
166166
result
167167
}
168-
169-
170168
}
171169

172170
fn resolve_closure<'a, 'tcx>(

src/librustc_trans/callee.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ pub fn resolve_and_get_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
181181
-> ValueRef
182182
{
183183
get_fn(ccx, ty::Instance::resolve(ccx.tcx(),
184-
ty::ParamEnv::empty(traits::Reveal::All),
185-
def_id,
186-
substs).unwrap())
184+
ty::ParamEnv::empty(traits::Reveal::All),
185+
def_id,
186+
substs).unwrap())
187187
}

src/librustc_trans/mir/block.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,9 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
431431
let (instance, mut llfn) = match callee.ty.sty {
432432
ty::TyFnDef(def_id, substs) => {
433433
(Some(ty::Instance::resolve(bcx.ccx.tcx(),
434-
ty::ParamEnv::empty(traits::Reveal::All),
435-
def_id,
436-
substs).unwrap()),
434+
ty::ParamEnv::empty(traits::Reveal::All),
435+
def_id,
436+
substs).unwrap()),
437437
None)
438438
}
439439
ty::TyFnPtr(_) => {

src/librustc_trans/mir/constant.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,9 @@ impl<'a, 'tcx> MirConstContext<'a, 'tcx> {
262262
args: IndexVec<mir::Local, Result<Const<'tcx>, ConstEvalErr<'tcx>>>)
263263
-> Result<Const<'tcx>, ConstEvalErr<'tcx>> {
264264
let instance = ty::Instance::resolve(ccx.tcx(),
265-
ty::ParamEnv::empty(traits::Reveal::All),
266-
def_id,
267-
substs).unwrap();
265+
ty::ParamEnv::empty(traits::Reveal::All),
266+
def_id,
267+
substs).unwrap();
268268
let mir = ccx.tcx().instance_mir(instance.def);
269269
MirConstContext::new(ccx, &mir, instance.substs, args).trans()
270270
}

0 commit comments

Comments
 (0)