1 files changed, 10 insertions, 0 deletions

diff --git a/editors/code/src/utils/diagnostics/rust.ts b/editors/code/src/utils/diagnostics/rust.ts
index d16576eb1..bfb494a3a 100644
--- a/editors/code/src/utils/diagnostics/rust.ts
+++ b/editors/code/src/utils/diagnostics/rust.ts
@@ -103,6 +103,7 @@ function isUnusedOrUnnecessary(rd: RustDiagnostic): boolean {
     return [
         'dead_code',
         'unknown_lints',
+        'unreachable_code',
         'unused_attributes',
         'unused_imports',
         'unused_macros',
@@ -182,6 +183,7 @@ export function mapRustDiagnosticToVsCode(
     const secondarySpans = rd.spans.filter(s => !s.is_primary);
 
     const severity = mapLevelToSeverity(rd.level);
+    let primarySpanLabel = primarySpan.label;
 
     const vd = new vscode.Diagnostic(location.range, rd.message, severity);
 
@@ -220,9 +222,17 @@ export function mapRustDiagnosticToVsCode(
         }
         if (messageLine) {
             vd.message += `\n${messageLine}`;
+
+            // These secondary messages usually duplicate the content of the
+            // primary span label.
+            primarySpanLabel = undefined;
         }
     }
 
+    if (primarySpanLabel) {
+        vd.message += `\n${primarySpanLabel}`;
+    }
+
     if (isUnusedOrUnnecessary(rd)) {
         vd.tags = [vscode.DiagnosticTag.Unnecessary];
     }