Merge #7722

7722: Fix incorrect missing field diagnostic with box patterns r=Veykril a=lnicola

Closes #7711 

Co-authored-by: Laurențiu Nicola <[email protected]>

2 files changed, 37 insertions, 4 deletions

diff --git a/crates/hir_ty/src/diagnostics.rs b/crates/hir_ty/src/diagnostics.rs
index 19da51acd..6bca7aa0d 100644
--- a/crates/hir_ty/src/diagnostics.rs
+++ b/crates/hir_ty/src/diagnostics.rs
@@ -682,6 +682,30 @@ fn baz(s: S) -> i32 {
     }
 
     #[test]
+    fn missing_record_pat_field_box() {
+        check_diagnostics(
+            r"
+struct S { s: Box<u32> }
+fn x(a: S) {
+    let S { box s } = a;
+}
+",
+        )
+    }
+
+    #[test]
+    fn missing_record_pat_field_ref() {
+        check_diagnostics(
+            r"
+struct S { s: u32 }
+fn x(a: S) {
+    let S { ref s } = a;
+}
+",
+        )
+    }
+
+    #[test]
     fn break_outside_of_loop() {
         check_diagnostics(
             r#"
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index 2fa7b8c1e..52ac97c84 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -381,11 +381,20 @@ impl ast::RecordPatField {
         if let Some(name_ref) = self.name_ref() {
             return Some(NameOrNameRef::NameRef(name_ref));
         }
-        if let Some(ast::Pat::IdentPat(pat)) = self.pat() {
-            let name = pat.name()?;
-            return Some(NameOrNameRef::Name(name));
+        match self.pat() {
+            Some(ast::Pat::IdentPat(pat)) => {
+                let name = pat.name()?;
+                Some(NameOrNameRef::Name(name))
+            }
+            Some(ast::Pat::BoxPat(pat)) => match pat.pat() {
+                Some(ast::Pat::IdentPat(pat)) => {
+                    let name = pat.name()?;
+                    Some(NameOrNameRef::Name(name))
+                }
+                _ => None,
+            },
+            _ => None,
         }
-        None
     }
 }