user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style fixes as requested by @eddyb

Browse source
This commit is contained in:
Douglas Campos 2017-09-28 08:36:34 -04:00
parent 081b29c1f6
commit 29220663c1
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/ty/instance.rs
View file

@ -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>(

6
src/librustc_trans/callee.rs
View file

@ -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())
}

6
src/librustc_trans/mir/block.rs
View file

@ -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(_) => {

6
src/librustc_trans/mir/constant.rs
View file

@ -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()
}