Auto merge of rust-lang#17634 - lnicola:fix-xtask-install, r=lnicola

bors · bors · commit e872d2f677fa · 2024-07-19T06:15:00.000Z
minor: Make xtask install work again CC rust-lang/rust-analyzer#17559 (comment)
diff --git 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() })

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ impl Malloc {`
`289`	`289`
`290`	`290`	`impl Install {`
`291`	`291`	`pub(crate) fn server(&self) -> Option<ServerOpt> {`
`292`		`- if !self.server {`
	`292`	`+ if (self.client \|\| self.proc_macro_server) && !self.server {`
`293`	`293`	`return None;`
`294`	`294`	`}`
`295`	`295`	`let malloc = if self.mimalloc {`
`@@ -308,7 +308,7 @@ impl Install {`
`308`	`308`	`Some(ProcMacroServerOpt { dev_rel: self.dev_rel })`
`309`	`309`	`}`
`310`	`310`	`pub(crate) fn client(&self) -> Option<ClientOpt> {`
`311`		`- if !self.client {`
	`311`	`+ if (self.server \|\| self.proc_macro_server) && !self.client {`
`312`	`312`	`return None;`
`313`	`313`	`}`
`314`	`314`	`Some(ClientOpt { code_bin: self.code_bin.clone() })`