Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links

1 files changed, 10 insertions, 1 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 1adf055d0..f079f73b8 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -592,6 +592,15 @@
                     "default": true,
                     "markdownDescription": "Whether to show experimental rust-analyzer diagnostics that might have more false positives than usual."
                 },
+                "rust-analyzer.diagnostics.disabled": {
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "List of rust-analyzer diagnostics to disable",
+                    "default": []
+                },
                 "rust-analyzer.diagnostics.warningsAsInfo": {
                     "type": "array",
                     "uniqueItems": true,
@@ -607,7 +616,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "description": "List of warnings warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
+                    "description": "List of warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
                     "default": []
                 }
             }