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

Rollup merge of #81716 - m-ou-se:fix-ice, r=eddyb

Browse Source 
Fix non-existent-field ICE for generic fields.

I mentioned this ICE in a chat and it took about 3 milliseconds before `@eddyb` found the problem and said this change would fix it. :)

This also changes one the field types in the related test to one that triggered the ICE.

Fixes #81627.
Fixes #81672.
Fixes #81709.

Cc https://github.com/rust-lang/rust/pull/81480 `@b-naber` `@estebank.`
This commit is contained in:
Mara Bos 2021-02-03 18:51:18 +01:00 committed by GitHub
commit 46174188e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_typeck/src/check/expr.rs
View File

@ -1974,7 +1974,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
field_path.push(candidate_field.ident.normalize_to_macros_2_0()); field_path.push(candidate_field.ident.normalize_to_macros_2_0());
let field_ty = candidate_field.ty(self.tcx, subst); let field_ty = candidate_field.ty(self.tcx, subst);
if let Some((nested_fields, _)) = self.get_field_candidates(span, &field_ty) { if let Some((nested_fields, subst)) = self.get_field_candidates(span, &field_ty) {
for field in nested_fields.iter() { for field in nested_fields.iter() {
let ident = field.ident.normalize_to_macros_2_0(); let ident = field.ident.normalize_to_macros_2_0();
if ident == target_field { if ident == target_field {

4
src/test/ui/suggestions/non-existent-field-present-in-subfield.fixed
View File

@ -3,7 +3,7 @@
struct Foo { struct Foo {
first: Bar, first: Bar,
_second: u32, _second: u32,
_third: u32, _third: Vec<String>,
} }
struct Bar { struct Bar {
@ -32,7 +32,7 @@ fn main() {
let d = D { test: e }; let d = D { test: e };
let c = C { c: d }; let c = C { c: d };
let bar = Bar { bar: c }; let bar = Bar { bar: c };
let fooer = Foo { first: bar, _second: 4, _third: 5 }; let fooer = Foo { first: bar, _second: 4, _third: Vec::new() };
let _test = &fooer.first.bar.c; let _test = &fooer.first.bar.c;
//~^ ERROR no field //~^ ERROR no field

4
src/test/ui/suggestions/non-existent-field-present-in-subfield.rs
View File

@ -3,7 +3,7 @@
struct Foo { struct Foo {
first: Bar, first: Bar,
_second: u32, _second: u32,
_third: u32, _third: Vec<String>,
} }
struct Bar { struct Bar {
@ -32,7 +32,7 @@ fn main() {
let d = D { test: e }; let d = D { test: e };
let c = C { c: d }; let c = C { c: d };
let bar = Bar { bar: c }; let bar = Bar { bar: c };
let fooer = Foo { first: bar, _second: 4, _third: 5 }; let fooer = Foo { first: bar, _second: 4, _third: Vec::new() };
let _test = &fooer.c; let _test = &fooer.c;
//~^ ERROR no field //~^ ERROR no field