Skip to content

Commit

Permalink
Don't give method suggestions when method probe fails due to bad impl…
Browse files Browse the repository at this point in the history
… of Deref
  • Loading branch information
compiler-errors committed Sep 29, 2024
1 parent d194948 commit 40d413f
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 8 deletions.
6 changes: 5 additions & 1 deletion compiler/rustc_hir_typeck/src/method/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ use rustc_middle::ty::{
self, GenericArgs, GenericArgsRef, GenericParamDefKind, Ty, TypeVisitableExt,
};
use rustc_middle::{bug, span_bug};
use rustc_span::Span;
use rustc_span::symbol::Ident;
use rustc_span::{ErrorGuaranteed, Span};
use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;
use rustc_trait_selection::traits::{self, NormalizeExt};
use tracing::{debug, instrument};
Expand Down Expand Up @@ -66,6 +66,9 @@ pub(crate) enum MethodError<'tcx> {

// Found a match, but the return type is wrong
BadReturnType,

// Error has already been emitted, no need to emit another one.
ErrorReported(ErrorGuaranteed),
}

// Contains a list of static methods that may apply, a list of unsatisfied trait predicates which
Expand Down Expand Up @@ -120,6 +123,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
Err(PrivateMatch(..)) => false,
Err(IllegalSizedBound { .. }) => true,
Err(BadReturnType) => false,
Err(ErrorReported(_)) => false,
}
}

Expand Down
8 changes: 1 addition & 7 deletions compiler/rustc_hir_typeck/src/method/probe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
_ => bug!("unexpected bad final type in method autoderef"),
};
self.demand_eqtype(span, ty, Ty::new_error(self.tcx, guar));
return Err(MethodError::NoMatch(NoMatchData {
static_candidates: Vec::new(),
unsatisfied_predicates: Vec::new(),
out_of_scope_traits: Vec::new(),
similar_candidate: None,
mode,
}));
return Err(MethodError::ErrorReported(guar));
}
}

Expand Down
2 changes: 2 additions & 0 deletions compiler/rustc_hir_typeck/src/method/suggest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
return err.emit();
}

MethodError::ErrorReported(guar) => guar,

MethodError::BadReturnType => bug!("no return type expectations but got BadReturnType"),
}
}
Expand Down
13 changes: 13 additions & 0 deletions tests/ui/methods/dont-suggest-import-on-deref-err.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
use std::clone::Clone;
use std::ops::Deref;

#[derive(Clone)]
pub struct Foo {}

impl Deref for Foo {}
//~^ ERROR not all trait items implemented

pub fn main() {
let f = Foo {};
let _ = f.clone();
}
12 changes: 12 additions & 0 deletions tests/ui/methods/dont-suggest-import-on-deref-err.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error[E0046]: not all trait items implemented, missing: `Target`, `deref`
--> $DIR/dont-suggest-import-on-deref-err.rs:7:1
|
LL | impl Deref for Foo {}
| ^^^^^^^^^^^^^^^^^^ missing `Target`, `deref` in implementation
|
= help: implement the missing item: `type Target = /* Type */;`
= help: implement the missing item: `fn deref(&self) -> &<Self as Deref>::Target { todo!() }`

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0046`.

0 comments on commit 40d413f

Please sign in to comment.