internal: use cov-mark rather than bailing out diagnostic

Author: matklad

crates/hir/src/diagnostics.rs

@@ -3,8 +3,6 @@
 //!
 //! This probably isn't the best way to do this -- ideally, diagnistics should
 //! be expressed in terms of hir types themselves.
-use std::any::Any;
-
 use cfg::{CfgExpr, CfgOptions};
 use either::Either;
 use hir_def::path::ModPath;
@@ -157,25 +155,4 @@ pub struct MissingMatchArms {
     pub arms: AstPtr<ast::MatchArmList>,
 }
 
-#[derive(Debug)]
-pub struct InternalBailedOut {
-    pub file: HirFileId,
-    pub pat_syntax_ptr: SyntaxNodePtr,
-}
-
-impl Diagnostic for InternalBailedOut {
-    fn code(&self) -> DiagnosticCode {
-        DiagnosticCode("internal:match-check-bailed-out")
-    }
-    fn message(&self) -> String {
-        format!("Internal: match check bailed out")
-    }
-    fn display_source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.pat_syntax_ptr.clone() }
-    }
-    fn as_any(&self) -> &(dyn Any + Send + 'static) {
-        self
-    }
-}
-
 pub use hir_ty::diagnostics::IncorrectCase;

crates/hir/src/lib.rs

@@ -86,8 +86,8 @@ use crate::{
 pub use crate::{
     attrs::{HasAttrs, Namespace},
     diagnostics::{
-        AnyDiagnostic, BreakOutsideOfLoop, InactiveCode, IncorrectCase, InternalBailedOut,
-        MacroError, MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkOrSomeInTailExpr,
+        AnyDiagnostic, BreakOutsideOfLoop, InactiveCode, IncorrectCase, MacroError,
+        MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkOrSomeInTailExpr,
         MissingUnsafe, NoSuchField, RemoveThisSemicolon, ReplaceFilterMapNextWithFindMap,
         UnimplementedBuiltinMacro, UnresolvedExternCrate, UnresolvedImport, UnresolvedMacroCall,
         UnresolvedModule, UnresolvedProcMacro,
@@ -461,7 +461,6 @@ impl Module {
         self,
         db: &dyn HirDatabase,
         sink: &mut DiagnosticSink,
-        internal_diagnostics: bool,
     ) -> Vec<AnyDiagnostic> {
         let _p = profile::span("Module::diagnostics").detail(|| {
             format!("{:?}", self.name(db).map_or("<unknown>".into(), |name| name.to_string()))
@@ -619,11 +618,11 @@ impl Module {
         }
         for decl in self.declarations(db) {
             match decl {
-                ModuleDef::Function(f) => acc.extend(f.diagnostics(db, sink, internal_diagnostics)),
+                ModuleDef::Function(f) => acc.extend(f.diagnostics(db, sink)),
                 ModuleDef::Module(m) => {
                     // Only add diagnostics from inline modules
                     if def_map[m.id.local_id].origin.is_inline() {
-                        acc.extend(m.diagnostics(db, sink, internal_diagnostics))
+                        acc.extend(m.diagnostics(db, sink))
                     }
                 }
                 _ => acc.extend(decl.diagnostics(db)),
@@ -633,7 +632,7 @@ impl Module {
         for impl_def in self.impl_defs(db) {
             for item in impl_def.items(db) {
                 if let AssocItem::Function(f) = item {
-                    acc.extend(f.diagnostics(db, sink, internal_diagnostics));
+                    acc.extend(f.diagnostics(db, sink));
                 }
             }
         }
@@ -1040,7 +1039,6 @@ impl Function {
         self,
         db: &dyn HirDatabase,
         sink: &mut DiagnosticSink,
-        internal_diagnostics: bool,
     ) -> Vec<AnyDiagnostic> {
         let mut acc: Vec<AnyDiagnostic> = Vec::new();
         let krate = self.module(db).id.krate();
@@ -1100,9 +1098,7 @@ impl Function {
             }
         }
 
-        for diagnostic in
-            BodyValidationDiagnostic::collect(db, self.id.into(), internal_diagnostics)
-        {
+        for diagnostic in BodyValidationDiagnostic::collect(db, self.id.into()) {
             match diagnostic {
                 BodyValidationDiagnostic::RecordMissingFields {
                     record,
@@ -1223,18 +1219,6 @@ impl Function {
                         Err(SyntheticSyntax) => (),
                     }
                 }
-                BodyValidationDiagnostic::InternalBailedOut { pat } => {
-                    match source_map.pat_syntax(pat) {
-                        Ok(source_ptr) => {
-                            let pat_syntax_ptr = source_ptr.value.either(Into::into, Into::into);
-                            sink.push(InternalBailedOut {
-                                file: source_ptr.file_id,
-                                pat_syntax_ptr,
-                            });
-                        }
-                        Err(SyntheticSyntax) => (),
-                    }
-                }
             }
         }
 

crates/hir_ty/src/diagnostics/expr.rs

@@ -50,21 +50,13 @@ pub enum BodyValidationDiagnostic {
     MissingMatchArms {
         match_expr: ExprId,
     },
-    InternalBailedOut {
-        pat: PatId,
-    },
 }
 
 impl BodyValidationDiagnostic {
-    pub fn collect(
-        db: &dyn HirDatabase,
-        owner: DefWithBodyId,
-        internal_diagnostics: bool,
-    ) -> Vec<BodyValidationDiagnostic> {
+    pub fn collect(db: &dyn HirDatabase, owner: DefWithBodyId) -> Vec<BodyValidationDiagnostic> {
         let _p = profile::span("BodyValidationDiagnostic::collect");
         let infer = db.infer(owner);
         let mut validator = ExprValidator::new(owner, infer.clone());
-        validator.internal_diagnostics = internal_diagnostics;
         validator.validate_body(db);
         validator.diagnostics
     }
@@ -74,12 +66,11 @@ struct ExprValidator {
     owner: DefWithBodyId,
     infer: Arc<InferenceResult>,
     pub(super) diagnostics: Vec<BodyValidationDiagnostic>,
-    internal_diagnostics: bool,
 }
 
 impl ExprValidator {
     fn new(owner: DefWithBodyId, infer: Arc<InferenceResult>) -> ExprValidator {
-        ExprValidator { owner, infer, diagnostics: Vec::new(), internal_diagnostics: false }
+        ExprValidator { owner, infer, diagnostics: Vec::new() }
     }
 
     fn validate_body(&mut self, db: &dyn HirDatabase) {
@@ -308,9 +299,7 @@ impl ExprValidator {
             // fit the match expression, we skip this diagnostic. Skipping the entire
             // diagnostic rather than just not including this match arm is preferred
             // to avoid the chance of false positives.
-            if self.internal_diagnostics {
-                self.diagnostics.push(BodyValidationDiagnostic::InternalBailedOut { pat: arm.pat })
-            }
+            cov_mark::hit!(validate_match_bailed_out);
             return;
         }
 

crates/ide/src/diagnostics.rs

@@ -181,10 +181,9 @@ pub(crate) fn diagnostics(
         });
 
     let mut diags = Vec::new();
-    let internal_diagnostics = cfg!(test);
     let module = sema.to_module_def(file_id);
     if let Some(m) = module {
-        diags = m.diagnostics(db, &mut sink, internal_diagnostics)
+        diags = m.diagnostics(db, &mut sink)
     }
 
     drop(sink);