Skip to content

Commit 8d784be

Browse files
authored
Merge pull request rust-lang#18953 from VinTarZ/master
Fix `debug_assertions` broken in 1c5a125
2 parents fa71da9 + 824bad7 commit 8d784be

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ config_data! {
582582
cargo_buildScripts_useRustcWrapper: bool = true,
583583
/// List of cfg options to enable with the given values.
584584
cargo_cfgs: Vec<String> = {
585-
vec!["debug_assertion".into(), "miri".into()]
585+
vec!["debug_assertions".into(), "miri".into()]
586586
},
587587
/// Extra arguments that are passed to every cargo invocation.
588588
cargo_extraArgs: Vec<String> = vec![],

src/tools/rust-analyzer/docs/user/generated_config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ avoid checking unnecessary things.
9595
Default:
9696
----
9797
[
98-
"debug_assertion",
98+
"debug_assertions",
9999
"miri"
100100
]
101101
----

src/tools/rust-analyzer/editors/code/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@
816816
"rust-analyzer.cargo.cfgs": {
817817
"markdownDescription": "List of cfg options to enable with the given values.",
818818
"default": [
819-
"debug_assertion",
819+
"debug_assertions",
820820
"miri"
821821
],
822822
"type": "array",

0 commit comments

Comments
 (0)