Skip to content

Commit 02a1f30

Browse files
BryanskiyBryanskiy
committed
Delegation: support coercion for target expression
1 parent a4ce33c commit 02a1f30

File tree

15 files changed

+241
-36
lines changed

15 files changed

+241
-36
lines changed

‎compiler/rustc_ast_lowering/src/delegation.rs

+60-15
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
3939
use crate::{ImplTraitPosition, ResolverAstLoweringExt};
4040

41-
use super::{ImplTraitContext, LoweringContext, ParamMode};
41+
use super::{ImplTraitContext, LoweringContext, ParamMode, ParenthesizedGenericArgs};
4242

4343
use ast::visit::Visitor;
4444
use hir::def::{DefKind, PartialRes, Res};
@@ -259,8 +259,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
259259
self_param_id: pat_node_id,
260260
};
261261
self_resolver.visit_block(block);
262-
let block = this.lower_block(block, false);
263-
this.mk_expr(hir::ExprKind::Block(block, None), block.span)
262+
this.lower_target_expr(&block)
264263
} else {
265264
let pat_hir_id = this.lower_node_id(pat_node_id);
266265
this.generate_arg(pat_hir_id, span)
@@ -273,26 +272,72 @@ impl<'hir> LoweringContext<'_, 'hir> {
273272
})
274273
}
275274

276-
// Generates fully qualified call for the resulting body.
275+
fn lower_target_expr(&mut self, block: &Block) -> hir::Expr<'hir> {
276+
if block.stmts.len() == 1
277+
&& let StmtKind::Expr(expr) = &block.stmts[0].kind
278+
{
279+
return self.lower_expr_mut(expr);
280+
}
281+
282+
let block = self.lower_block(block, false);
283+
self.mk_expr(hir::ExprKind::Block(block, None), block.span)
284+
}
285+
286+
// Generates expression for the resulting body. If possible, `MethodCall` is used
287+
// instead of fully qualified call for the self type coercion.
277288
fn finalize_body_lowering(
278289
&mut self,
279290
delegation: &Delegation,
280291
args: Vec<hir::Expr<'hir>>,
281292
span: Span,
282293
) -> hir::Expr<'hir> {
283-
let path = self.lower_qpath(
284-
delegation.id,
285-
&delegation.qself,
286-
&delegation.path,
287-
ParamMode::Optional,
288-
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
289-
None,
290-
);
291-
292294
let args = self.arena.alloc_from_iter(args);
293-
let path_expr = self.arena.alloc(self.mk_expr(hir::ExprKind::Path(path), span));
294-
let call = self.arena.alloc(self.mk_expr(hir::ExprKind::Call(path_expr, args), span));
295295

296+
let has_generic_args =
297+
delegation.path.segments.iter().rev().skip(1).any(|segment| segment.args.is_some());
298+
299+
let call = if self
300+
.get_resolution_id(delegation.id, span)
301+
.and_then(|def_id| Ok(self.has_self(def_id, span)))
302+
.unwrap_or_default()
303+
&& delegation.qself.is_none()
304+
&& !has_generic_args
305+
{
306+
let ast_segment = delegation.path.segments.last().unwrap();
307+
let segment = self.lower_path_segment(
308+
delegation.path.span,
309+
ast_segment,
310+
ParamMode::Optional,
311+
ParenthesizedGenericArgs::Err,
312+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
313+
None,
314+
None,
315+
);
316+
let segment = self.arena.alloc(segment);
317+
318+
let method_call_id = self.next_id();
319+
if let Some(traits) = self.resolver.trait_map.remove(&delegation.id) {
320+
self.trait_map.insert(method_call_id.local_id, traits.into_boxed_slice());
321+
}
322+
323+
self.arena.alloc(hir::Expr {
324+
hir_id: method_call_id,
325+
kind: hir::ExprKind::MethodCall(segment, &args[0], &args[1..], span),
326+
span,
327+
})
328+
} else {
329+
let path = self.lower_qpath(
330+
delegation.id,
331+
&delegation.qself,
332+
&delegation.path,
333+
ParamMode::Optional,
334+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
335+
None,
336+
);
337+
338+
let callee_path = self.arena.alloc(self.mk_expr(hir::ExprKind::Path(path), span));
339+
self.arena.alloc(self.mk_expr(hir::ExprKind::Call(callee_path, args), span))
340+
};
296341
let block = self.arena.alloc(hir::Block {
297342
stmts: &[],
298343
expr: Some(call),

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+1
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
570570
IsSuggestion(true),
571571
callee_ty.peel_refs(),
572572
callee_expr.unwrap().hir_id,
573+
None,
573574
TraitsInScope,
574575
|mut ctxt| ctxt.probe_for_similar_candidate(),
575576
)

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1588,6 +1588,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
15881588
IsSuggestion(true),
15891589
self_ty,
15901590
expr.hir_id,
1591+
None,
15911592
ProbeScope::TraitsInScope,
15921593
)
15931594
{

‎compiler/rustc_hir_typeck/src/method/mod.rs

+13-2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
104104
IsSuggestion(true),
105105
self_ty,
106106
call_expr_id,
107+
None,
107108
ProbeScope::TraitsInScope,
108109
) {
109110
Ok(pick) => {
@@ -182,8 +183,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
182183
self_expr: &'tcx hir::Expr<'tcx>,
183184
args: &'tcx [hir::Expr<'tcx>],
184185
) -> Result<MethodCallee<'tcx>, MethodError<'tcx>> {
185-
let pick =
186-
self.lookup_probe(segment.ident, self_ty, call_expr, ProbeScope::TraitsInScope)?;
186+
let pick = self.lookup_probe(
187+
segment.ident,
188+
self_ty,
189+
call_expr,
190+
segment.res.opt_def_id(),
191+
ProbeScope::TraitsInScope,
192+
)?;
187193

188194
self.lint_edition_dependent_dot_call(
189195
self_ty, segment, span, call_expr, self_expr, &pick, args,
@@ -208,6 +214,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
208214
segment.ident,
209215
trait_type,
210216
call_expr,
217+
None,
211218
ProbeScope::TraitsInScope,
212219
) {
213220
Ok(ref new_pick) if pick.differs_from(new_pick) => {
@@ -276,6 +283,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
276283
method_name: Ident,
277284
self_ty: Ty<'tcx>,
278285
call_expr: &hir::Expr<'_>,
286+
expected_def_id: Option<DefId>,
279287
scope: ProbeScope,
280288
) -> probe::PickResult<'tcx> {
281289
let pick = self.probe_for_name(
@@ -285,6 +293,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
285293
IsSuggestion(false),
286294
self_ty,
287295
call_expr.hir_id,
296+
expected_def_id,
288297
scope,
289298
)?;
290299
pick.maybe_emit_unstable_name_collision_hint(self.tcx, method_name.span, call_expr.hir_id);
@@ -306,6 +315,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
306315
IsSuggestion(true),
307316
self_ty,
308317
call_expr.hir_id,
318+
None,
309319
scope,
310320
)?;
311321
Ok(pick)
@@ -516,6 +526,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
516526
IsSuggestion(false),
517527
self_ty,
518528
expr_id,
529+
None,
519530
ProbeScope::TraitsInScope,
520531
);
521532
let pick = match (pick, struct_variant) {

‎compiler/rustc_hir_typeck/src/method/probe.rs

+34
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,27 @@ pub(crate) struct ProbeContext<'a, 'tcx> {
9696

9797
scope_expr_id: HirId,
9898

99+
/// Delegation item can be expanded into method calls or fully qualified calls
100+
/// depending on the callee's signature. Method calls are used to allow
101+
/// autoref/autoderef for target expression. For example in:
102+
///
103+
/// ```ignore (illustrative)
104+
/// trait Trait : Sized {
105+
/// fn by_value(self) -> i32 { 1 }
106+
/// fn by_mut_ref(&mut self) -> i32 { 2 }
107+
/// fn by_ref(&self) -> i32 { 3 }
108+
/// }
109+
///
110+
/// struct NewType(SomeType);
111+
/// impl Trait for NewType {
112+
/// reuse Trait::* { self.0 }
113+
/// }
114+
/// ```
115+
///
116+
/// `self.0` will automatically coerce. The difference with existing method lookup
117+
/// is that methods in delegation items are pre-resolved by callee path (`Trait::*`).
118+
expected_def_id: Option<DefId>,
119+
99120
/// Is this probe being done for a diagnostic? This will skip some error reporting
100121
/// machinery, since we don't particularly care about, for example, similarly named
101122
/// candidates if we're *reporting* similarly named candidates.
@@ -248,6 +269,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
248269
IsSuggestion(true),
249270
self_ty,
250271
scope_expr_id,
272+
None,
251273
ProbeScope::AllTraits,
252274
|probe_cx| Ok(probe_cx.candidate_method_names(candidate_filter)),
253275
)
@@ -263,6 +285,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
263285
IsSuggestion(true),
264286
self_ty,
265287
scope_expr_id,
288+
None,
266289
ProbeScope::AllTraits,
267290
|probe_cx| probe_cx.pick(),
268291
)
@@ -281,6 +304,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
281304
is_suggestion: IsSuggestion,
282305
self_ty: Ty<'tcx>,
283306
scope_expr_id: HirId,
307+
expected_def_id: Option<DefId>,
284308
scope: ProbeScope,
285309
) -> PickResult<'tcx> {
286310
self.probe_op(
@@ -291,6 +315,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
291315
is_suggestion,
292316
self_ty,
293317
scope_expr_id,
318+
expected_def_id,
294319
scope,
295320
|probe_cx| probe_cx.pick(),
296321
)
@@ -315,6 +340,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
315340
is_suggestion,
316341
self_ty,
317342
scope_expr_id,
343+
None,
318344
scope,
319345
|probe_cx| {
320346
Ok(probe_cx
@@ -335,6 +361,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
335361
is_suggestion: IsSuggestion,
336362
self_ty: Ty<'tcx>,
337363
scope_expr_id: HirId,
364+
expected_def_id: Option<DefId>,
338365
scope: ProbeScope,
339366
op: OP,
340367
) -> Result<R, MethodError<'tcx>>
@@ -476,6 +503,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
476503
&orig_values,
477504
steps.steps,
478505
scope_expr_id,
506+
expected_def_id,
479507
is_suggestion,
480508
);
481509

@@ -571,6 +599,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
571599
orig_steps_var_values: &'a OriginalQueryValues<'tcx>,
572600
steps: &'tcx [CandidateStep<'tcx>],
573601
scope_expr_id: HirId,
602+
expected_def_id: Option<DefId>,
574603
is_suggestion: IsSuggestion,
575604
) -> ProbeContext<'a, 'tcx> {
576605
ProbeContext {
@@ -590,6 +619,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
590619
static_candidates: RefCell::new(Vec::new()),
591620
unsatisfied_predicates: RefCell::new(Vec::new()),
592621
scope_expr_id,
622+
expected_def_id,
593623
is_suggestion,
594624
}
595625
}
@@ -1220,6 +1250,9 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
12201250
) -> Option<PickResult<'tcx>> {
12211251
let mut applicable_candidates: Vec<_> = candidates
12221252
.iter()
1253+
.filter(|candidate| {
1254+
!matches!(self.expected_def_id, Some(def_id) if def_id != candidate.item.def_id)
1255+
})
12231256
.map(|probe| {
12241257
(probe, self.consider_probe(self_ty, probe, possibly_unsatisfied_predicates))
12251258
})
@@ -1677,6 +1710,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
16771710
self.orig_steps_var_values,
16781711
self.steps,
16791712
self.scope_expr_id,
1713+
None,
16801714
IsSuggestion(true),
16811715
);
16821716
pcx.allow_similar_names = true;

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2034,6 +2034,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
20342034
IsSuggestion(true),
20352035
rcvr_ty,
20362036
expr_id,
2037+
None,
20372038
ProbeScope::TraitsInScope,
20382039
)
20392040
.is_ok()
@@ -3095,6 +3096,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
30953096
IsSuggestion(true),
30963097
deref_ty,
30973098
ty.hir_id,
3099+
None,
30983100
ProbeScope::TraitsInScope,
30993101
) {
31003102
if deref_ty.is_suggestable(self.tcx, true)

‎compiler/rustc_resolve/src/late.rs

+20-2
Original file line numberDiff line numberDiff line change
@@ -3316,14 +3316,32 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
33163316
self.visit_ty(&qself.ty);
33173317
}
33183318
self.visit_path(&delegation.path, delegation.id);
3319+
let last_ident = delegation.path.segments.last().unwrap().ident;
3320+
3321+
// Saving traits for a `MethodCall` that has not yet been generated.
3322+
// Traits found in the path are also considered visible:
3323+
//
3324+
// impl Trait for Type {
3325+
// reuse inner::TraitFoo::*; // OK, even `TraitFoo` is not in scope.
3326+
// }
3327+
let mut traits = self.traits_in_scope(last_ident, ValueNS);
3328+
for segment in &delegation.path.segments {
3329+
if let Some(partial_res) = self.r.partial_res_map.get(&segment.id)
3330+
&& let Some(res_id) = partial_res.full_res().and_then(|res| res.opt_def_id())
3331+
&& self.r.tcx.def_kind(res_id) == DefKind::Trait
3332+
{
3333+
traits.push(TraitCandidate { def_id: res_id, import_ids: smallvec![] });
3334+
}
3335+
}
3336+
self.r.trait_map.insert(delegation.id, traits);
3337+
33193338
if let Some(body) = &delegation.body {
33203339
self.with_rib(ValueNS, RibKind::FnOrCoroutine, |this| {
33213340
// `PatBoundCtx` is not necessary in this context
33223341
let mut bindings = smallvec![(PatBoundCtx::Product, Default::default())];
33233342

3324-
let span = delegation.path.segments.last().unwrap().ident.span;
33253343
this.fresh_binding(
3326-
Ident::new(kw::SelfLower, span),
3344+
Ident::new(kw::SelfLower, last_ident.span),
33273345
delegation.id,
33283346
PatternSource::FnParam,
33293347
&mut bindings,

‎tests/ui/delegation/bad-resolve.rs

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ impl Trait for S {
3434

3535
reuse foo { &self.0 }
3636
//~^ ERROR cannot find function `foo` in this scope
37+
reuse Trait::foo2 { self.0 }
38+
//~^ ERROR cannot find function `foo2` in trait `Trait`
39+
//~| ERROR method `foo2` is not a member of trait `Trait`
3740
}
3841

3942
mod prefix {}

0 commit comments

Comments
 (0)