language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Cleanup install command

Browse source
This commit is contained in:
Aleksey Kladov 2021-03-05 11:51:32 +03:00
parent 97b1550dda
commit 142f9a03fd
4 changed files with 56 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

33
xtask/src/install.rs
View file

@ -5,12 +5,24 @@ use std::{env, path::PathBuf, str};
use anyhow::{bail, format_err, Context, Result};
use xshell::{cmd, pushd};
use crate::flags;
// Latest stable, feel free to send a PR if this lags behind.
const REQUIRED_RUST_VERSION: u32 = 50;
pub(crate) struct InstallCmd {
pub(crate) client: Option<ClientOpt>,
pub(crate) server: Option<ServerOpt>,
impl flags::Install {
pub(crate) fn run(self) -> Result<()> {
if cfg!(target_os = "macos") {
fix_path_for_mac().context("Fix path for mac")?
}
if let Some(server) = self.server() {
install_server(server).context("install server")?;
}
if let Some(client) = self.client() {
install_client(client).context("install client")?;
}
Ok(())
}
}
#[derive(Clone, Copy)]
@ -70,21 +82,6 @@ pub(crate) enum Malloc {
Jemalloc,
}
impl InstallCmd {
pub(crate) fn run(self) -> Result<()> {
if cfg!(target_os = "macos") {
fix_path_for_mac().context("Fix path for mac")?
}
if let Some(server) = self.server {
install_server(server).context("install server")?;
}
if let Some(client) = self.client {
install_client(client).context("install client")?;
}
Ok(())
}
}
fn fix_path_for_mac() -> Result<()> {
let mut vscode_path: Vec<PathBuf> = {
const COMMON_APP_PATH: &str =