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

make probe_for generic over final operation

Browse source
This commit is contained in:
Niko Matsakis 2016-11-22 10:47:18 -05:00 • committed by Guillaume Gomez
parent 18b33579e1
commit 579e52692f
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/librustc_typeck/check/method/probe.rs
View file

@ -161,7 +161,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
self_ty,
return_type,
scope_expr_id);
self.probe_for(span, mode, LookingFor::ReturnType(return_type), self_ty, scope_expr_id)
self.probe_op(span, mode, LookingFor::ReturnType(return_type), self_ty, scope_expr_id,
|probe_cx| probe_cx.pick())
}
pub fn probe_for_name(&self,
@ -175,17 +176,24 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
self_ty,
item_name,
scope_expr_id);
self.probe_for(span, mode, LookingFor::MethodName(item_name), self_ty, scope_expr_id)
self.probe_op(span,
mode,
LookingFor::MethodName(item_name),
self_ty,
scope_expr_id,
|probe_cx| probe_cx.pick())
}
fn probe_for(&self,
span: Span,
mode: Mode,
looking_for: LookingFor<'tcx>,
self_ty: Ty<'tcx>,
scope_expr_id: ast::NodeId)
-> PickResult<'tcx> {
fn probe_op<'a,OP,R>(&'a self,
span: Span,
mode: Mode,
looking_for: LookingFor<'tcx>,
self_ty: Ty<'tcx>,
scope_expr_id: ast::NodeId,
op: OP)
-> R
where OP: FnOnce(&mut ProbeContext<'a, 'gcx, 'tcx>) -> R
{
// FIXME(#18741) -- right now, creating the steps involves evaluating the
// `*` operator, which registers obligations that then escape into
// the global fulfillment context and thus has global
@ -241,7 +249,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
steps, opt_simplified_steps);
probe_cx.assemble_inherent_candidates();
probe_cx.assemble_extension_candidates_for_traits_in_scope(scope_expr_id)?;
probe_cx.pick()
op(&mut probe_cx)
})
}