internal: refactor missing match arms diagnostics

Author: matklad

crates/hir/src/diagnostics.rs

@@ -38,6 +38,7 @@ diagnostics![
     MacroError,
     MismatchedArgCount,
     MissingFields,
+    MissingMatchArms,
     MissingOkOrSomeInTailExpr,
     MissingUnsafe,
     NoSuchField,
@@ -149,31 +150,13 @@ pub struct MissingOkOrSomeInTailExpr {
     pub required: String,
 }
 
-// Diagnostic: missing-match-arm
-//
-// This diagnostic is triggered if `match` block is missing one or more match arms.
 #[derive(Debug)]
 pub struct MissingMatchArms {
     pub file: HirFileId,
     pub match_expr: AstPtr<ast::Expr>,
     pub arms: AstPtr<ast::MatchArmList>,
 }
 
-impl Diagnostic for MissingMatchArms {
-    fn code(&self) -> DiagnosticCode {
-        DiagnosticCode("missing-match-arm")
-    }
-    fn message(&self) -> String {
-        String::from("Missing match arm")
-    }
-    fn display_source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.match_expr.clone().into() }
-    }
-    fn as_any(&self) -> &(dyn Any + Send + 'static) {
-        self
-    }
-}
-
 #[derive(Debug)]
 pub struct InternalBailedOut {
     pub file: HirFileId,

crates/hir/src/lib.rs

@@ -1209,11 +1209,14 @@ impl Function {
                                 if let (Some(match_expr), Some(arms)) =
                                     (match_expr.expr(), match_expr.match_arm_list())
                                 {
-                                    sink.push(MissingMatchArms {
-                                        file: source_ptr.file_id,
-                                        match_expr: AstPtr::new(&match_expr),
-                                        arms: AstPtr::new(&arms),
-                                    })
+                                    acc.push(
+                                        MissingMatchArms {
+                                            file: source_ptr.file_id,
+                                            match_expr: AstPtr::new(&match_expr),
+                                            arms: AstPtr::new(&arms),
+                                        }
+                                        .into(),
+                                    )
                                 }
                             }
                         }