Fix tests

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
index fd04163de9803cf5ce9aa306a7e3a5396eb66a38..a9c0edcf9fbc9f78a4fa341e53bdc64340de2bba 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Warning,
+                DiagnosticSeverity(
+                    2,
+                ),
             ),
             code: Some(
                 String(
@@ -140,7 +142,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
@@ -231,7 +235,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
index a7f936a703e33f871da26f79c3da6dd038f750de..fd69097d057ceb70440544bd517b1dd887123892 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
index 8bee4cfe10a739a69aba28d6849f159c984415c8..1c25a3ed69636504ec2881141268e516f57af7bb 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: None,
             code_description: None,
@@ -90,7 +92,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: None,
             code_description: None,
@@ -157,7 +161,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: None,
             code_description: None,

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
index afc562a0e2bee18f012f5f390075af1b1cc710d6..653fb0130d120a0e019ea6432ae0ac271286c094 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
index 05074a914b53c0ccc79f3f0722ba4ffae3289add..f37e416b7b7ccfff21ab8f35885d2b060c701210 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
index 3ded70411d353c7c6c4aaf081e17d25bf42f8c06..df73efe5f872647211694f4fc003f6dd99cfa899 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Warning,
+                DiagnosticSeverity(
+                    2,
+                ),
             ),
             code: Some(
                 String(
@@ -67,7 +69,9 @@
             ),
             tags: Some(
                 [
-                    Unnecessary,
+                    DiagnosticTag(
+                        1,
+                    ),
                 ],
             ),
             data: None,
@@ -98,7 +102,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
index 0993aa1af14bce2e6372b5fbe53cbd3fe4738f46..ad22a34d6731d4f1335346472336917587c5eb54 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
@@ -67,7 +69,9 @@
             ),
             tags: Some(
                 [
-                    Unnecessary,
+                    DiagnosticTag(
+                        1,
+                    ),
                 ],
             ),
             data: None,
@@ -98,7 +102,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
index d7a974ae57974230cd1d3bdc2b331334e481aa75..1072d8a17700612f64e138ef138495c4b52de268 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Information,
+                DiagnosticSeverity(
+                    3,
+                ),
             ),
             code: Some(
                 String(
@@ -67,7 +69,9 @@
             ),
             tags: Some(
                 [
-                    Unnecessary,
+                    DiagnosticTag(
+                        1,
+                    ),
                 ],
             ),
             data: None,
@@ -98,7 +102,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
index 5ea27a152752d7b954451a12705afd1e52493a22..3e043666aab6c4a57025c6621b114e03a378e0ec 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(
@@ -114,7 +116,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(

diff --git a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
index f77abde5155c5797441fd8c6457fcf829732f87c..67e442d73d7a1895c19c2cac8679a622ef0fcec8 100644 (file)
--- a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Warning,
+                DiagnosticSeverity(
+                    2,
+                ),
             ),
             code: Some(
                 String(
@@ -140,7 +142,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
@@ -231,7 +235,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(