Merge pull request #18953 from VinTarZ/master

Fix `debug_assertions` broken in 1c5a125
rust-lang · Jan 16, 2025 · 1f717b0 · 1f717b0
2 parents 132a2a0 + d71015d
commit 1f717b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
@@ -582,7 +582,7 @@ config_data! {
         cargo_buildScripts_useRustcWrapper: bool = true,
         /// List of cfg options to enable with the given values.
         cargo_cfgs: Vec<String> = {
-            vec!["debug_assertion".into(), "miri".into()]
+            vec!["debug_assertions".into(), "miri".into()]
         },
         /// Extra arguments that are passed to every cargo invocation.
         cargo_extraArgs: Vec<String> = vec![],

diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
@@ -95,7 +95,7 @@ avoid checking unnecessary things.
 Default:
 ----
 [
-  "debug_assertion",
+  "debug_assertions",
   "miri"
 ]
 ----

diff --git a/editors/code/package.json b/editors/code/package.json
@@ -816,7 +816,7 @@
                     "rust-analyzer.cargo.cfgs": {
                         "markdownDescription": "List of cfg options to enable with the given values.",
                         "default": [
-                            "debug_assertion",
+                            "debug_assertions",
                             "miri"
                         ],
                         "type": "array",
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ avoid checking unnecessary things. @@
     Default:
     ----
     [
-      "debug_assertion",
+      "debug_assertions",
       "miri"
     ]
     ----
@@ Expand Down @@