diff options
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/src/dist.rs | 2 | ||||
-rw-r--r-- | xtask/src/install.rs | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index 3a14f8a63..2002d3e2a 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs | |||
@@ -27,7 +27,7 @@ fn dist_client(version: &str, release_tag: &str) -> Result<()> { | |||
27 | 27 | ||
28 | patch | 28 | patch |
29 | .replace(r#""version": "0.4.0-dev""#, &format!(r#""version": "{}""#, version)) | 29 | .replace(r#""version": "0.4.0-dev""#, &format!(r#""version": "{}""#, version)) |
30 | .replace(r#""releaseTag": "nightly""#, &format!(r#""releaseTag": "{}""#, release_tag)); | 30 | .replace(r#""releaseTag": null"#, &format!(r#""releaseTag": "{}""#, release_tag)); |
31 | 31 | ||
32 | if nightly { | 32 | if nightly { |
33 | patch.replace( | 33 | patch.replace( |
diff --git a/xtask/src/install.rs b/xtask/src/install.rs index d0d745b05..bc32a04b3 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs | |||
@@ -24,7 +24,6 @@ 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(); | ||
28 | if cfg!(target_os = "macos") { | 27 | if cfg!(target_os = "macos") { |
29 | fix_path_for_mac().context("Fix path for mac")? | 28 | fix_path_for_mac().context("Fix path for mac")? |
30 | } | 29 | } |
@@ -34,16 +33,6 @@ impl InstallCmd { | |||
34 | if let Some(client) = self.client { | 33 | if let Some(client) = self.client { |
35 | install_client(client).context("install client")?; | 34 | install_client(client).context("install client")?; |
36 | } | 35 | } |
37 | if both { | ||
38 | eprintln!( | ||
39 | " | ||
40 | Installation complete. | ||
41 | |||
42 | Add `\"rust-analyzer.serverPath\": \"rust-analyzer\",` to VS Code settings, | ||
43 | otherwise it will use the latest release from GitHub. | ||
44 | " | ||
45 | ) | ||
46 | } | ||
47 | Ok(()) | 36 | Ok(()) |
48 | } | 37 | } |
49 | } | 38 | } |