From 4b5435b52bdcb54eea18c80f952cfc3a72975e70 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 20 Mar 2020 12:50:50 +0100
Subject: Make from-source install use cargo installed binary by default

---
 xtask/src/dist.rs    |  2 +-
 xtask/src/install.rs | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'xtask')

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<()> {
 
     patch
         .replace(r#""version": "0.4.0-dev""#, &format!(r#""version": "{}""#, version))
-        .replace(r#""releaseTag": "nightly""#, &format!(r#""releaseTag": "{}""#, release_tag));
+        .replace(r#""releaseTag": null"#, &format!(r#""releaseTag": "{}""#, release_tag));
 
     if nightly {
         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 {
 
 impl InstallCmd {
     pub fn run(self) -> Result<()> {
-        let both = self.server.is_some() && self.client.is_some();
         if cfg!(target_os = "macos") {
             fix_path_for_mac().context("Fix path for mac")?
         }
@@ -34,16 +33,6 @@ impl InstallCmd {
         if let Some(client) = self.client {
             install_client(client).context("install client")?;
         }
-        if both {
-            eprintln!(
-                "
-    Installation complete.
-
-    Add `\"rust-analyzer.serverPath\": \"rust-analyzer\",` to VS Code settings,
-    otherwise it will use the latest release from GitHub.
-"
-            )
-        }
         Ok(())
     }
 }
-- 
cgit v1.2.3