1 files changed, 7 insertions, 16 deletions

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 253c360bb..815a633e5 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -51,28 +51,26 @@ impl DiagnosticCode {
 
 #[derive(Debug)]
 pub struct Diagnostic {
-    // pub name: Option<String>,
+    pub code: DiagnosticCode,
     pub message: String,
     pub range: TextRange,
     pub severity: Severity,
-    pub fixes: Option<Vec<Assist>>,
     pub unused: bool,
-    pub code: Option<DiagnosticCode>,
     pub experimental: bool,
+    pub fixes: Option<Vec<Assist>>,
 }
 
 impl Diagnostic {
     fn new(code: &'static str, message: impl Into<String>, range: TextRange) -> Diagnostic {
         let message = message.into();
-        let code = Some(DiagnosticCode(code));
-        Self {
+        Diagnostic {
+            code: DiagnosticCode(code),
             message,
             range,
             severity: Severity::Error,
-            fixes: None,
             unused: false,
-            code,
             experimental: false,
+            fixes: None,
         }
     }
 
@@ -181,15 +179,8 @@ pub(crate) fn diagnostics(
     }
 
     res.retain(|d| {
-        if let Some(code) = d.code {
-            if ctx.config.disabled.contains(code.as_str()) {
-                return false;
-            }
-        }
-        if ctx.config.disable_experimental && d.experimental {
-            return false;
-        }
-        true
+        !ctx.config.disabled.contains(d.code.as_str())
+            && !(ctx.config.disable_experimental && d.experimental)
     });
 
     res