Auto merge of #12213 - Veykril:config-fix, r=Veykril

fix: Fix incorrect config patching for runBuildScripts
rust-lang · May 11, 2022 · 94fa8a6 · 94fa8a6
2 parents be770a7 + e68352a
commit 94fa8a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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",],