mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-04 19:29:07 +00:00
Rollup merge of #125080 - bvanjoi:fix-124946, r=nnethercote
only find segs chain for missing methods when no available candidates Fixes #124946 This PR includes two changes: - Extracting the lookup for the missing method in chains into a single function. - Calling this function only when there are no candidates available.
This commit is contained in:
commit
8c64acdbdc
@ -1143,7 +1143,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let label_span_not_found = |err: &mut Diag<'_>| {
|
let mut find_candidate_for_method = false;
|
||||||
|
|
||||||
|
let mut label_span_not_found = |err: &mut Diag<'_>| {
|
||||||
if unsatisfied_predicates.is_empty() {
|
if unsatisfied_predicates.is_empty() {
|
||||||
err.span_label(span, format!("{item_kind} not found in `{ty_str}`"));
|
err.span_label(span, format!("{item_kind} not found in `{ty_str}`"));
|
||||||
let is_string_or_ref_str = match rcvr_ty.kind() {
|
let is_string_or_ref_str = match rcvr_ty.kind() {
|
||||||
@ -1219,6 +1221,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||||||
err.note(format!(
|
err.note(format!(
|
||||||
"the {item_kind} was found for\n{type_candidates}{additional_types}"
|
"the {item_kind} was found for\n{type_candidates}{additional_types}"
|
||||||
));
|
));
|
||||||
|
find_candidate_for_method = mode == Mode::MethodCall;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -1371,9 +1374,32 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If an appropriate error source is not found, check method chain for possible candiates
|
|
||||||
if unsatisfied_predicates.is_empty()
|
if !find_candidate_for_method {
|
||||||
&& let Mode::MethodCall = mode
|
self.lookup_segments_chain_for_no_match_method(
|
||||||
|
&mut err,
|
||||||
|
item_name,
|
||||||
|
item_kind,
|
||||||
|
source,
|
||||||
|
no_match_data,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
self.note_derefed_ty_has_method(&mut err, source, rcvr_ty, item_name, expected);
|
||||||
|
Some(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// If an appropriate error source is not found, check method chain for possible candidates
|
||||||
|
fn lookup_segments_chain_for_no_match_method(
|
||||||
|
&self,
|
||||||
|
err: &mut Diag<'_>,
|
||||||
|
item_name: Ident,
|
||||||
|
item_kind: &str,
|
||||||
|
source: SelfSource<'tcx>,
|
||||||
|
no_match_data: &NoMatchData<'tcx>,
|
||||||
|
) {
|
||||||
|
if no_match_data.unsatisfied_predicates.is_empty()
|
||||||
|
&& let Mode::MethodCall = no_match_data.mode
|
||||||
&& let SelfSource::MethodCall(mut source_expr) = source
|
&& let SelfSource::MethodCall(mut source_expr) = source
|
||||||
{
|
{
|
||||||
let mut stack_methods = vec![];
|
let mut stack_methods = vec![];
|
||||||
@ -1394,6 +1420,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||||||
.unwrap_or(Ty::new_misc_error(self.tcx)),
|
.unwrap_or(Ty::new_misc_error(self.tcx)),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// FIXME: `probe_for_name_many` searches for methods in inherent implementations,
|
||||||
|
// so it may return a candidate that doesn't belong to this `revr_ty`. We need to
|
||||||
|
// check whether the instantiated type matches the received one.
|
||||||
for _matched_method in self.probe_for_name_many(
|
for _matched_method in self.probe_for_name_many(
|
||||||
Mode::MethodCall,
|
Mode::MethodCall,
|
||||||
item_name,
|
item_name,
|
||||||
@ -1416,8 +1445,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.note_derefed_ty_has_method(&mut err, source, rcvr_ty, item_name, expected);
|
|
||||||
Some(err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn find_likely_intended_associated_item(
|
fn find_likely_intended_associated_item(
|
||||||
|
19
tests/ui/const-generics/lookup-method.rs
Normal file
19
tests/ui/const-generics/lookup-method.rs
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
// https://github.com/rust-lang/rust/issues/124946
|
||||||
|
|
||||||
|
struct Builder<const A: bool, const B: bool>;
|
||||||
|
|
||||||
|
impl<const A: bool> Builder<A, false> {
|
||||||
|
fn cast(self) -> Builder<A, true> {
|
||||||
|
Builder
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Builder<true, true> {
|
||||||
|
fn build(self) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let b = Builder::<false, false>;
|
||||||
|
b.cast().build();
|
||||||
|
//~^ ERROR: no method named `build` found for struct `Builder<false, true>` in the current scope
|
||||||
|
}
|
15
tests/ui/const-generics/lookup-method.stderr
Normal file
15
tests/ui/const-generics/lookup-method.stderr
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
error[E0599]: no method named `build` found for struct `Builder<false, true>` in the current scope
|
||||||
|
--> $DIR/lookup-method.rs:17:14
|
||||||
|
|
|
||||||
|
LL | struct Builder<const A: bool, const B: bool>;
|
||||||
|
| -------------------------------------------- method `build` not found for this struct
|
||||||
|
...
|
||||||
|
LL | b.cast().build();
|
||||||
|
| ^^^^^ method not found in `Builder<false, true>`
|
||||||
|
|
|
||||||
|
= note: the method was found for
|
||||||
|
- `Builder<true, true>`
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0599`.
|
Loading…
Reference in New Issue
Block a user