Skip to content

Commit 94fa8a6

Browse files
committed
Auto merge of #12213 - Veykril:config-fix, r=Veykril
fix: Fix incorrect config patching for runBuildScripts
2 parents be770a7 + e68352a commit 94fa8a6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ pub(super) fn patch_json_for_outdated_configs(json: &mut Value) {
3636
assist.importPrefix -> imports.prefix;
3737
cache.warmup -> primeCaches.enable;
3838
cargo.loadOutDirsFromCheck -> cargo.buildScripts.enable;
39-
cargo.runBuildScripts -> cargo.runBuildScripts.overrideCommand;
40-
cargo.runBuildScriptsCommand -> cargo.runBuildScripts.overrideCommand;
41-
cargo.useRustcWrapperForBuildScripts -> cargo.runBuildScripts.useRustcWrapper;
39+
cargo.runBuildScripts -> cargo.buildScripts.enable;
40+
cargo.runBuildScriptsCommand -> cargo.buildScripts.overrideCommand;
41+
cargo.useRustcWrapperForBuildScripts -> cargo.buildScripts.useRustcWrapper;
4242
diagnostics.enableExperimental -> diagnostics.experimental.enable;
4343
experimental.procAttrMacros -> procMacro.attributes.enable;
4444
highlighting.strings -> semanticHighlighting.strings.enable;

editors/code/src/config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ export async function updateConfig(config: vscode.WorkspaceConfiguration) {
148148
["assist.importPrefix", "imports.prefix",],
149149
["cache.warmup", "primeCaches.enable",],
150150
["cargo.loadOutDirsFromCheck", "cargo.buildScripts.enable",],
151-
["cargo.runBuildScripts", "cargo.runBuildScripts.overrideCommand",],
152-
["cargo.runBuildScriptsCommand", "cargo.runBuildScripts.overrideCommand",],
153-
["cargo.useRustcWrapperForBuildScripts", "cargo.runBuildScripts.useRustcWrapper",],
151+
["cargo.runBuildScripts", "cargo.buildScripts.enable",],
152+
["cargo.runBuildScriptsCommand", "cargo.buildScripts.overrideCommand",],
153+
["cargo.useRustcWrapperForBuildScripts", "cargo.buildScripts.useRustcWrapper",],
154154
["completion.snippets", "completion.snippets.custom",],
155155
["diagnostics.enableExperimental", "diagnostics.experimental.enable",],
156156
["experimental.procAttrMacros", "procMacro.attributes.enable",],

0 commit comments

Comments
 (0)