bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #96844 - Badel2:actually-fix-96583, r=compiler-errors

Browse source 
Actually fix ICE from #96583

PR #96746 fixed a very similar bug, so the same logic is used in a different place.

I originally concluded that the two issues (#96583 and #96738) were identical by comparing the backtrace, but I didn't look close enough.
This commit is contained in:
Matthias Krüger 2022-05-09 18:45:38 +02:00 • committed by GitHub
commit 84a8f8dedf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
compiler/rustc_typeck/src/check/expr.rs
View file

@ -44,7 +44,7 @@ use rustc_middle::ty::adjustment::{Adjust, Adjustment, AllowTwoPhase};
use rustc_middle::ty::error::ExpectedFound; use rustc_middle::ty::error::ExpectedFound;
use rustc_middle::ty::error::TypeError::{FieldMisMatch, Sorts}; use rustc_middle::ty::error::TypeError::{FieldMisMatch, Sorts};
use rustc_middle::ty::subst::SubstsRef; use rustc_middle::ty::subst::SubstsRef;
use rustc_middle::ty::{self, AdtKind, Ty, TypeFoldable}; use rustc_middle::ty::{self, AdtKind, DefIdTree, Ty, TypeFoldable};
use rustc_session::parse::feature_err; use rustc_session::parse::feature_err;
use rustc_span::hygiene::DesugaringKind; use rustc_span::hygiene::DesugaringKind;
use rustc_span::lev_distance::find_best_match_for_name; use rustc_span::lev_distance::find_best_match_for_name;
@ -2034,17 +2034,26 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
base: &'tcx hir::Expr<'tcx>, base: &'tcx hir::Expr<'tcx>,
def_id: DefId, def_id: DefId,
) { ) {
let local_id = def_id.expect_local(); if let Some(local_id) = def_id.as_local() {
let hir_id = self.tcx.hir().local_def_id_to_hir_id(local_id); let hir_id = self.tcx.hir().local_def_id_to_hir_id(local_id);
let node = self.tcx.hir().get(hir_id); let node = self.tcx.hir().get(hir_id);
if let Some(fields) = node.tuple_fields() { if let Some(fields) = node.tuple_fields() {
let kind = match self.tcx.opt_def_kind(local_id) { let kind = match self.tcx.opt_def_kind(local_id) {
Some(DefKind::Ctor(of, _)) => of, Some(DefKind::Ctor(of, _)) => of,
_ => return, _ => return,
}; };
suggest_call_constructor(base.span, kind, fields.len(), err); suggest_call_constructor(base.span, kind, fields.len(), err);
}
} else {
// The logic here isn't smart but `associated_item_def_ids`
// doesn't work nicely on local.
if let DefKind::Ctor(of, _) = self.tcx.def_kind(def_id) {
let parent_def_id = self.tcx.parent(def_id);
let fields = self.tcx.associated_item_def_ids(parent_def_id);
suggest_call_constructor(base.span, of, fields.len(), err);
}
} }
} }

1
src/test/ui/typeck/issue-96738.rs
View file

@ -1,3 +1,4 @@
fn main() { fn main() {
Some.nonexistent_method(); //~ ERROR: no method named `nonexistent_method` found Some.nonexistent_method(); //~ ERROR: no method named `nonexistent_method` found
Some.nonexistent_field; //~ ERROR: no field `nonexistent_field`
} }

18
src/test/ui/typeck/issue-96738.stderr
View file

@ -11,6 +11,20 @@ help: call the constructor
LL | (Some)(_).nonexistent_method(); LL | (Some)(_).nonexistent_method();
| + ++++ | + ++++
error: aborting due to previous error error[E0609]: no field `nonexistent_field` on type `fn(_) -> Option<_> {Option::<_>::Some}`
--> $DIR/issue-96738.rs:3:10
|
LL | Some.nonexistent_field;
| ---- ^^^^^^^^^^^^^^^^^
| |
| this is the constructor of an enum variant
|
help: call the constructor
|
LL | (Some)(_).nonexistent_field;
| + ++++
For more information about this error, try `rustc --explain E0599`. error: aborting due to 2 previous errors
Some errors have detailed explanations: E0599, E0609.
For more information about an error, try `rustc --explain E0599`.