internal: kill diagnostic sink

Author: matklad

crates/hir/src/diagnostics.rs

@@ -9,10 +9,6 @@ use hir_def::path::ModPath;
 use hir_expand::{name::Name, HirFileId, InFile};
 use syntax::{ast, AstPtr, SyntaxNodePtr, TextRange};
 
-pub use crate::diagnostics_sink::{
-    Diagnostic, DiagnosticCode, DiagnosticSink, DiagnosticSinkBuilder,
-};
-
 macro_rules! diagnostics {
     ($($diag:ident,)*) => {
         pub enum AnyDiagnostic {$(

crates/hir/src/diagnostics_sink.rs

@@ -27,7 +27,6 @@ mod attrs;
 mod has_source;
 
 pub mod diagnostics;
-pub mod diagnostics_sink;
 pub mod db;
 
 mod display;
@@ -78,10 +77,7 @@ use syntax::{
 };
 use tt::{Ident, Leaf, Literal, TokenTree};
 
-use crate::{
-    db::{DefDatabase, HirDatabase},
-    diagnostics_sink::DiagnosticSink,
-};
+use crate::db::{DefDatabase, HirDatabase};
 
 pub use crate::{
     attrs::{HasAttrs, Namespace},
@@ -457,15 +453,10 @@ impl Module {
         self.id.def_map(db.upcast())[self.id.local_id].scope.visibility_of((*def).into())
     }
 
-    pub fn diagnostics(
-        self,
-        db: &dyn HirDatabase,
-        sink: &mut DiagnosticSink,
-    ) -> Vec<AnyDiagnostic> {
+    pub fn diagnostics(self, db: &dyn HirDatabase, acc: &mut Vec<AnyDiagnostic>) {
         let _p = profile::span("Module::diagnostics").detail(|| {
             format!("{:?}", self.name(db).map_or("<unknown>".into(), |name| name.to_string()))
         });
-        let mut acc: Vec<AnyDiagnostic> = Vec::new();
         let def_map = self.id.def_map(db.upcast());
         for diag in def_map.diagnostics() {
             if diag.in_module != self.id.local_id {
@@ -618,11 +609,11 @@ impl Module {
         }
         for decl in self.declarations(db) {
             match decl {
-                ModuleDef::Function(f) => acc.extend(f.diagnostics(db, sink)),
+                ModuleDef::Function(f) => f.diagnostics(db, acc),
                 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))
+                        m.diagnostics(db, acc)
                     }
                 }
                 _ => acc.extend(decl.diagnostics(db)),
@@ -632,11 +623,10 @@ 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));
+                    f.diagnostics(db, acc);
                 }
             }
         }
-        acc
     }
 
     pub fn declarations(self, db: &dyn HirDatabase) -> Vec<ModuleDef> {
@@ -1035,12 +1025,7 @@ impl Function {
         db.function_data(self.id).is_async()
     }
 
-    pub fn diagnostics(
-        self,
-        db: &dyn HirDatabase,
-        sink: &mut DiagnosticSink,
-    ) -> Vec<AnyDiagnostic> {
-        let mut acc: Vec<AnyDiagnostic> = Vec::new();
+    pub fn diagnostics(self, db: &dyn HirDatabase, acc: &mut Vec<AnyDiagnostic>) {
         let krate = self.module(db).id.krate();
 
         let source_map = db.body_with_source_map(self.id.into()).1;
@@ -1225,7 +1210,6 @@ impl Function {
         for diag in hir_ty::diagnostics::validate_module_item(db, krate, self.id.into()) {
             acc.push(diag.into())
         }
-        acc
     }
 
     /// Whether this function declaration has a definition.

crates/hir/src/lib.rs

@@ -26,12 +26,7 @@ mod unresolved_proc_macro;
 
 mod field_shorthand;
 
-use std::cell::RefCell;
-
-use hir::{
-    diagnostics::{AnyDiagnostic, DiagnosticCode, DiagnosticSinkBuilder},
-    Semantics,
-};
+use hir::{diagnostics::AnyDiagnostic, Semantics};
 use ide_assists::AssistResolveStrategy;
 use ide_db::{base_db::SourceDatabase, RootDatabase};
 use itertools::Itertools;
@@ -45,6 +40,15 @@ use unlinked_file::UnlinkedFile;
 
 use crate::{Assist, AssistId, AssistKind, FileId, Label, SourceChange};
 
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub struct DiagnosticCode(pub &'static str);
+
+impl DiagnosticCode {
+    pub fn as_str(&self) -> &str {
+        self.0
+    }
+}
+
 #[derive(Debug)]
 pub struct Diagnostic {
     // pub name: Option<String>,
@@ -113,10 +117,6 @@ impl Diagnostic {
     fn with_unused(self, unused: bool) -> Self {
         Self { unused, ..self }
     }
-
-    fn with_code(self, code: Option<DiagnosticCode>) -> Self {
-        Self { code, ..self }
-    }
 }
 
 #[derive(Debug, Copy, Clone)]
@@ -161,35 +161,13 @@ pub(crate) fn diagnostics(
         check_unnecessary_braces_in_use_statement(&mut res, file_id, &node);
         field_shorthand::check(&mut res, file_id, &node);
     }
-    let res = RefCell::new(res);
-    let sink_builder = DiagnosticSinkBuilder::new()
-        // Only collect experimental diagnostics when they're enabled.
-        .filter(|diag| !(diag.is_experimental() && config.disable_experimental))
-        .filter(|diag| !config.disabled.contains(diag.code().as_str()));
-
-    // Finalize the `DiagnosticSink` building process.
-    let mut sink = sink_builder
-        // Diagnostics not handled above get no fix and default treatment.
-        .build(|d| {
-            res.borrow_mut().push(
-                Diagnostic::error(
-                    sema.diagnostics_display_range(d.display_source()).range,
-                    d.message(),
-                )
-                .with_code(Some(d.code())),
-            );
-        });
 
     let mut diags = Vec::new();
     let module = sema.to_module_def(file_id);
     if let Some(m) = module {
-        diags = m.diagnostics(db, &mut sink)
+        m.diagnostics(db, &mut diags)
     }
 
-    drop(sink);
-
-    let mut res = res.into_inner();
-
     let ctx = DiagnosticsContext { config, sema, resolve };
     if module.is_none() {
         let d = UnlinkedFile { file: file_id };
@@ -350,8 +328,8 @@ mod tests {
             )
             .unwrap()
             .pop()
-            .unwrap();
-        let fix = &diagnostic.fixes.unwrap()[nth];
+            .expect("no diagnostics");
+        let fix = &diagnostic.fixes.expect("diagnostic misses fixes")[nth];
         let actual = {
             let source_change = fix.source_change.as_ref().unwrap();
             let file_id = *source_change.source_file_edits.keys().next().unwrap();