From: Laurențiu Nicola <lnicola@dend.ro>
Date: Fri, 15 Oct 2021 17:28:28 +0000 (+0300)
Subject: Fix tests
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=29d281e523bf894e2cacf48be70e76f2b07c1868;p=rust.git

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 fd04163de98..a9c0edcf9fb 100644
--- 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 a7f936a703e..fd69097d057 100644
--- 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 8bee4cfe10a..1c25a3ed696 100644
--- 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 afc562a0e2b..653fb0130d1 100644
--- 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 05074a914b5..f37e416b7b7 100644
--- 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 3ded70411d3..df73efe5f87 100644
--- 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 0993aa1af14..ad22a34d673 100644
--- 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 d7a974ae579..1072d8a1770 100644
--- 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 5ea27a15275..3e043666aab 100644
--- 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 f77abde5155..67e442d73d7 100644
--- 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(