diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-10 09:53:54 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-10 09:53:54 +0000 |
commit | 33df947d62f176d4a1512e14e2cbf25490c3eb77 (patch) | |
tree | 278c99bfe751f5bcae9135f7bb0867a1154b215e /xtask/src | |
parent | b4ac3dda78ebea1b483c0164a39907daa0c8caaa (diff) | |
parent | bbd9013bca0e27788f293f429e30b0b90f393a34 (diff) |
Merge #3079
3079: Add note r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src')
-rw-r--r-- | xtask/src/install.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/xtask/src/install.rs b/xtask/src/install.rs index 8c65b51e3..0e7cda3fa 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs | |||
@@ -24,6 +24,7 @@ pub struct ServerOpt { | |||
24 | 24 | ||
25 | impl InstallCmd { | 25 | impl InstallCmd { |
26 | pub fn run(self) -> Result<()> { | 26 | pub fn run(self) -> Result<()> { |
27 | let both = self.server.is_some() && self.client.is_some(); | ||
27 | if cfg!(target_os = "macos") { | 28 | if cfg!(target_os = "macos") { |
28 | fix_path_for_mac().context("Fix path for mac")? | 29 | fix_path_for_mac().context("Fix path for mac")? |
29 | } | 30 | } |
@@ -33,6 +34,16 @@ impl InstallCmd { | |||
33 | if let Some(client) = self.client { | 34 | if let Some(client) = self.client { |
34 | install_client(client).context("install client")?; | 35 | install_client(client).context("install client")?; |
35 | } | 36 | } |
37 | if both { | ||
38 | eprintln!( | ||
39 | " | ||
40 | Installation complete. | ||
41 | |||
42 | Add `\"rust-analyzer.raLspServerPath\": \"ra_lsp_server\",` to VS Code settings, | ||
43 | otherwise it will use the latest release from GitHub. | ||
44 | " | ||
45 | ) | ||
46 | } | ||
36 | Ok(()) | 47 | Ok(()) |
37 | } | 48 | } |
38 | } | 49 | } |