mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't continue probing for method if in suggestion and autoderef hits ambiguity

Browse Source
This commit is contained in:
Michael Goulet 2024-05-23 18:47:32 -04:00
parent 5baee04b63
commit 4bc41b91d7
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_hir_typeck/src/method/probe.rs
View File

@ -395,8 +395,15 @@ pub(crate) fn probe_op<OP, R>(
// ambiguous.
if let Some(bad_ty) = &steps.opt_bad_ty {
if is_suggestion.0 {
// Ambiguity was encountered during a suggestion. Just keep going.
debug!("ProbeContext: encountered ambiguity in suggestion");
// Ambiguity was encountered during a suggestion. There's really
// not much use in suggesting methods in this case.
return Err(MethodError::NoMatch(NoMatchData {
static_candidates: Vec::new(),
unsatisfied_predicates: Vec::new(),
out_of_scope_traits: Vec::new(),
similar_candidate: None,
mode,
}));
} else if bad_ty.reached_raw_pointer
&& !self.tcx.features().arbitrary_self_types
&& !self.tcx.sess.at_least_rust_2018()

16
tests/ui/methods/suggest-method-on-call-for-ambig-receiver.rs Normal file
View File

@ -0,0 +1,16 @@
// Fix for <https://github.com/rust-lang/rust/issues/125432>.
fn separate_arms() {
let mut x = None;
match x {
None => {
x = Some(0);
}
Some(right) => {
consume(right);
//~^ ERROR cannot find function `consume` in this scope
}
}
}
fn main() {}

9
tests/ui/methods/suggest-method-on-call-for-ambig-receiver.stderr Normal file
View File

@ -0,0 +1,9 @@
error[E0425]: cannot find function `consume` in this scope
--> $DIR/suggest-method-on-call-for-ambig-receiver.rs:10:13
|
LL | consume(right);
| ^^^^^^^ not found in this scope
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0425`.