diff options
author | Aleksey Kladov <[email protected]> | 2020-03-04 17:32:34 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-04 17:32:34 +0000 |
commit | 2722184c6d53de560ff92e7af1f019c822669680 (patch) | |
tree | 7c7bba3328a85b0f4c5d9a3b7d9f3c3e3616b4f4 /xtask/src/install.rs | |
parent | ae6109a68ce6980bdaeb3824adfc14417d40aa4a (diff) | |
parent | fd586e58d97e4ac2d2448426cf6c4937b48c5660 (diff) |
Merge pull request #3458 from matklad/dist
cargo xtask dist
Diffstat (limited to 'xtask/src/install.rs')
-rw-r--r-- | xtask/src/install.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xtask/src/install.rs b/xtask/src/install.rs index f76467cac..d0d745b05 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs | |||
@@ -4,10 +4,7 @@ use std::{env, path::PathBuf, str}; | |||
4 | 4 | ||
5 | use anyhow::{bail, format_err, Context, Result}; | 5 | use anyhow::{bail, format_err, Context, Result}; |
6 | 6 | ||
7 | use crate::{ | 7 | use crate::not_bash::{pushd, run}; |
8 | not_bash::{pushd, run}, | ||
9 | project_root, | ||
10 | }; | ||
11 | 8 | ||
12 | // Latest stable, feel free to send a PR if this lags behind. | 9 | // Latest stable, feel free to send a PR if this lags behind. |
13 | const REQUIRED_RUST_VERSION: u32 = 41; | 10 | const REQUIRED_RUST_VERSION: u32 = 41; |
@@ -27,7 +24,6 @@ pub struct ServerOpt { | |||
27 | 24 | ||
28 | impl InstallCmd { | 25 | impl InstallCmd { |
29 | pub fn run(self) -> Result<()> { | 26 | pub fn run(self) -> Result<()> { |
30 | let _dir = pushd(project_root()); | ||
31 | let both = self.server.is_some() && self.client.is_some(); | 27 | let both = self.server.is_some() && self.client.is_some(); |
32 | if cfg!(target_os = "macos") { | 28 | if cfg!(target_os = "macos") { |
33 | fix_path_for_mac().context("Fix path for mac")? | 29 | fix_path_for_mac().context("Fix path for mac")? |