diff options
| author | bors <bors@rust-lang.org> | 2024-07-19 06:15:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-19 06:15:00 +0000 |
| commit | e6e8bd299ddbd2fc2804ed2462572859d7bb3727 (patch) | |
| tree | 144b3acb105525ba8f07a62d044d0f2c29f2fe66 | |
| parent | 40730a4baff2936224c09291a58e7c07e3368ae2 (diff) | |
| parent | 6fa6d2081a66e019bc13f476e94e0d9a1d984f54 (diff) | |
| download | rust-e6e8bd299ddbd2fc2804ed2462572859d7bb3727.tar.gz rust-e6e8bd299ddbd2fc2804ed2462572859d7bb3727.zip | |
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
| -rw-r--r-- | src/tools/rust-analyzer/xtask/src/flags.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/rust-analyzer/xtask/src/flags.rs b/src/tools/rust-analyzer/xtask/src/flags.rs index fd4291de9e1..ebb9e71a4f4 100644 --- a/src/tools/rust-analyzer/xtask/src/flags.rs +++ b/src/tools/rust-analyzer/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() }) |