bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #17634 - lnicola:fix-xtask-install, r=lnicola
minor: Make xtask install work again CC https://github.com/rust-lang/rust-analyzer/pull/17559#issuecomment-2234052939
Browse Source
bors 2024-07-19
parent 52143a5 · parent 89d089f · commit 71c7816
Diffstat
-rw-r--r--xtask/src/flags.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/xtask/src/flags.rs b/xtask/src/flags.rs
index fd4291de9e..ebb9e71a4f 100644
--- a/xtask/src/flags.rs
+++ b/xtask/src/flags.rs
@@ -289,7 +289,7 @@ impl Malloc {
impl Install {
pub(crate) fn server(&self) -> Option<ServerOpt> {
- if !self.server {
+ if (self.client || self.proc_macro_server) && !self.server {
return None;
}
let malloc = if self.mimalloc {
@@ -308,7 +308,7 @@ impl Install {
Some(ProcMacroServerOpt { dev_rel: self.dev_rel })
}
pub(crate) fn client(&self) -> Option<ClientOpt> {
- if !self.client {
+ if (self.server || self.proc_macro_server) && !self.client {
return None;
}
Some(ClientOpt { code_bin: self.code_bin.clone() })