diff options
| author | bors <bors@rust-lang.org> | 2022-05-11 10:38:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-11 10:38:56 +0000 |
| commit | 94fa8a6534cf93276ad7e205026402f24d41a0b2 (patch) | |
| tree | f3292019e7be03bcbb25c5050c7a1eda9290051f | |
| parent | be770a78a2bd6b2ec87a9442f60110b5aabbf6ce (diff) | |
| parent | e68352a9f56fbe1a263290bdda632194b1aaf62d (diff) | |
| download | rust-94fa8a6534cf93276ad7e205026402f24d41a0b2.tar.gz rust-94fa8a6534cf93276ad7e205026402f24d41a0b2.zip | |
Auto merge of #12213 - Veykril:config-fix, r=Veykril
fix: Fix incorrect config patching for runBuildScripts
| -rw-r--r-- | crates/rust-analyzer/src/config/patch_old_style.rs | 6 | ||||
| -rw-r--r-- | editors/code/src/config.ts | 6 |
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 ff0cb2b6398..104201682b4 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 5b650e1420a..0ce538e2e98 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",], |