bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Ensure that we don't try to access fields on a non-struct pattern type in diagnostic

Browse source 
Fix #135209.
This commit is contained in:
Esteban Küber 2025-01-07 22:06:58 +00:00
parent ad211ced81
commit 5f04f98c9a
3 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_resolve/src/late/diagnostics.rs
View file

@ -1130,7 +1130,9 @@ impl<'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
let None = following_seg else { return };
for rib in self.ribs[ValueNS].iter().rev() {
for (def_id, spans) in &rib.patterns_with_skipped_bindings {
if let Some(fields) = self.r.field_idents(*def_id) {
if let DefKind::Struct = self.r.tcx.def_kind(*def_id)
&& let Some(fields) = self.r.field_idents(*def_id)
{
for field in fields {
if field.name == segment.ident.name {
if spans.iter().all(|(_, had_error)| had_error.is_err()) {

7
tests/ui/pattern/struct-pattern-on-non-struct-resolve-error.rs Normal file
View file

@ -0,0 +1,7 @@
// Regression test for #135209.
// We ensure that we don't try to access fields on a non-struct pattern type.
fn main() {
if let Iterator::Item { .. } = 1 { //~ ERROR E0223
x //~ ERROR E0425
}
}

28
tests/ui/pattern/struct-pattern-on-non-struct-resolve-error.stderr Normal file
View file

@ -0,0 +1,28 @@
error[E0425]: cannot find value `x` in this scope
--> $DIR/struct-pattern-on-non-struct-resolve-error.rs:5:9
|
LL | x
| ^ not found in this scope
error[E0223]: ambiguous associated type
--> $DIR/struct-pattern-on-non-struct-resolve-error.rs:4:12
|
LL | if let Iterator::Item { .. } = 1 {
| ^^^^^^^^^^^^^^
|
help: use fully-qualified syntax
|
LL | if let <Ancestors<'_> as Iterator>::Item { .. } = 1 {
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LL | if let <Args as Iterator>::Item { .. } = 1 {
| ~~~~~~~~~~~~~~~~~~~~~~~~
LL | if let <ArgsOs as Iterator>::Item { .. } = 1 {
| ~~~~~~~~~~~~~~~~~~~~~~~~~~
LL | if let <CharIndices<'_> as Iterator>::Item { .. } = 1 {
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
and 71 other candidates
error: aborting due to 2 previous errors
Some errors have detailed explanations: E0223, E0425.
For more information about an error, try `rustc --explain E0223`.