提交 29220663 编写于 作者: D Douglas Campos

style fixes as requested by @EddyB

上级 081b29c1
...@@ -165,8 +165,6 @@ pub fn resolve(tcx: TyCtxt<'a, 'tcx, 'tcx>, ...@@ -165,8 +165,6 @@ pub fn resolve(tcx: TyCtxt<'a, 'tcx, 'tcx>,
debug!("resolve(def_id={:?}, substs={:?}) = {:?}", def_id, substs, result); debug!("resolve(def_id={:?}, substs={:?}) = {:?}", def_id, substs, result);
result result
} }
} }
fn resolve_closure<'a, 'tcx>( fn resolve_closure<'a, 'tcx>(
......
...@@ -181,7 +181,7 @@ pub fn resolve_and_get_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>, ...@@ -181,7 +181,7 @@ pub fn resolve_and_get_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
-> ValueRef -> ValueRef
{ {
get_fn(ccx, ty::Instance::resolve(ccx.tcx(), get_fn(ccx, ty::Instance::resolve(ccx.tcx(),
ty::ParamEnv::empty(traits::Reveal::All), ty::ParamEnv::empty(traits::Reveal::All),
def_id, def_id,
substs).unwrap()) substs).unwrap())
} }
...@@ -431,9 +431,9 @@ fn trans_terminator(&mut self, ...@@ -431,9 +431,9 @@ fn trans_terminator(&mut self,
let (instance, mut llfn) = match callee.ty.sty { let (instance, mut llfn) = match callee.ty.sty {
ty::TyFnDef(def_id, substs) => { ty::TyFnDef(def_id, substs) => {
(Some(ty::Instance::resolve(bcx.ccx.tcx(), (Some(ty::Instance::resolve(bcx.ccx.tcx(),
ty::ParamEnv::empty(traits::Reveal::All), ty::ParamEnv::empty(traits::Reveal::All),
def_id, def_id,
substs).unwrap()), substs).unwrap()),
None) None)
} }
ty::TyFnPtr(_) => { ty::TyFnPtr(_) => {
......
...@@ -262,9 +262,9 @@ fn trans_def(ccx: &'a CrateContext<'a, 'tcx>, ...@@ -262,9 +262,9 @@ fn trans_def(ccx: &'a CrateContext<'a, 'tcx>,
args: IndexVec<mir::Local, Result<Const<'tcx>, ConstEvalErr<'tcx>>>) args: IndexVec<mir::Local, Result<Const<'tcx>, ConstEvalErr<'tcx>>>)
-> Result<Const<'tcx>, ConstEvalErr<'tcx>> { -> Result<Const<'tcx>, ConstEvalErr<'tcx>> {
let instance = ty::Instance::resolve(ccx.tcx(), let instance = ty::Instance::resolve(ccx.tcx(),
ty::ParamEnv::empty(traits::Reveal::All), ty::ParamEnv::empty(traits::Reveal::All),
def_id, def_id,
substs).unwrap(); substs).unwrap();
let mir = ccx.tcx().instance_mir(instance.def); let mir = ccx.tcx().instance_mir(instance.def);
MirConstContext::new(ccx, &mir, instance.substs, args).trans() MirConstContext::new(ccx, &mir, instance.substs, args).trans()
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册