Unnamed repository; edit this file 'description' to name the repository.
fix: Fix incorrect config patching for runBuildScripts
Lukas Wirth 2022-05-11
parent b271ef8 · commit e68352a
-rw-r--r--crates/rust-analyzer/src/config/patch_old_style.rs6
-rw-r--r--editors/code/src/config.ts6
2 files changed, 6 insertions, 6 deletions
diff --git a/crates/rust-analyzer/src/config/patch_old_style.rs b/crates/rust-analyzer/src/config/patch_old_style.rs
index ff0cb2b639..104201682b 100644
--- a/crates/rust-analyzer/src/config/patch_old_style.rs
+++ b/crates/rust-analyzer/src/config/patch_old_style.rs
@@ -36,9 +36,9 @@ pub(super) fn patch_json_for_outdated_configs(json: &mut Value) {
assist.importPrefix -> imports.prefix;
cache.warmup -> primeCaches.enable;
cargo.loadOutDirsFromCheck -> cargo.buildScripts.enable;
- cargo.runBuildScripts -> cargo.runBuildScripts.overrideCommand;
- cargo.runBuildScriptsCommand -> cargo.runBuildScripts.overrideCommand;
- cargo.useRustcWrapperForBuildScripts -> cargo.runBuildScripts.useRustcWrapper;
+ cargo.runBuildScripts -> cargo.buildScripts.enable;
+ cargo.runBuildScriptsCommand -> cargo.buildScripts.overrideCommand;
+ cargo.useRustcWrapperForBuildScripts -> cargo.buildScripts.useRustcWrapper;
diagnostics.enableExperimental -> diagnostics.experimental.enable;
experimental.procAttrMacros -> procMacro.attributes.enable;
highlighting.strings -> semanticHighlighting.strings.enable;
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 5b650e1420..0ce538e2e9 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -148,9 +148,9 @@ export async function updateConfig(config: vscode.WorkspaceConfiguration) {
["assist.importPrefix", "imports.prefix",],
["cache.warmup", "primeCaches.enable",],
["cargo.loadOutDirsFromCheck", "cargo.buildScripts.enable",],
- ["cargo.runBuildScripts", "cargo.runBuildScripts.overrideCommand",],
- ["cargo.runBuildScriptsCommand", "cargo.runBuildScripts.overrideCommand",],
- ["cargo.useRustcWrapperForBuildScripts", "cargo.runBuildScripts.useRustcWrapper",],
+ ["cargo.runBuildScripts", "cargo.buildScripts.enable",],
+ ["cargo.runBuildScriptsCommand", "cargo.buildScripts.overrideCommand",],
+ ["cargo.useRustcWrapperForBuildScripts", "cargo.buildScripts.useRustcWrapper",],
["completion.snippets", "completion.snippets.custom",],
["diagnostics.enableExperimental", "diagnostics.experimental.enable",],
["experimental.procAttrMacros", "procMacro.attributes.enable",],