mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
fix: Fix incorrect config patching for runBuildScripts
This commit is contained in:
bors 2022-05-11 10:38:56 +00:00
commit 94fa8a6534
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/rust-analyzer/src/config/patch_old_style.rs
View File

@ -36,9 +36,9 @@ macro_rules! patch {
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;

6
editors/code/src/config.ts
View File

@ -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",],