about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVinTarZ <vintarz@yandex.ru>2025-01-16 14:19:16 +0300
committerGitHub <noreply@github.com>2025-01-16 14:19:16 +0300
commit824bad7f65597690e37be2e67a194e2294edb3fa (patch)
treea60961a851ecde6e84ade2fb70e4849dd2c150e4
parentfa71da9ff02be5df6df81fb357399bc6c28d1cdf (diff)
downloadrust-824bad7f65597690e37be2e67a194e2294edb3fa.tar.gz
rust-824bad7f65597690e37be2e67a194e2294edb3fa.zip
Fix `debug_assertions` broken in 1c5a125beb35725ccc2ade005db9870db734bf23
-rw-r--r--src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs2
-rw-r--r--src/tools/rust-analyzer/docs/user/generated_config.adoc2
-rw-r--r--src/tools/rust-analyzer/editors/code/package.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs
index 9d8dbfc7a48..3dc4379258f 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs
+++ b/src/tools/rust-analyzer/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/src/tools/rust-analyzer/docs/user/generated_config.adoc b/src/tools/rust-analyzer/docs/user/generated_config.adoc
index 2b518e06098..bd091db58d3 100644
--- a/src/tools/rust-analyzer/docs/user/generated_config.adoc
+++ b/src/tools/rust-analyzer/docs/user/generated_config.adoc
@@ -95,7 +95,7 @@ avoid checking unnecessary things.
 Default:
 ----
 [
-  "debug_assertion",
+  "debug_assertions",
   "miri"
 ]
 ----
diff --git a/src/tools/rust-analyzer/editors/code/package.json b/src/tools/rust-analyzer/editors/code/package.json
index 48e29a7fe28..8b066377f2b 100644
--- a/src/tools/rust-analyzer/editors/code/package.json
+++ b/src/tools/rust-analyzer/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",