Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add client install support for code-exploration build.

Browse source
This commit is contained in:
Jérémy 2020-12-08 19:23:25 +01:00
parent e2e6b709e6
commit 7cf2c0d46f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xtask/src/install.rs
View file

@ -16,6 +16,7 @@ pub struct InstallCmd {
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub enum ClientOpt { pub enum ClientOpt {
VsCode, VsCode,
VsCodeExploration,
VsCodeInsiders, VsCodeInsiders,
VsCodium, VsCodium,
VsCodeOss, VsCodeOss,
@ -26,10 +27,11 @@ impl ClientOpt {
pub const fn as_cmds(&self) -> &'static [&'static str] { pub const fn as_cmds(&self) -> &'static [&'static str] {
match self { match self {
ClientOpt::VsCode => &["code"], ClientOpt::VsCode => &["code"],
ClientOpt::VsCodeExploration => &["code-exploration"],
ClientOpt::VsCodeInsiders => &["code-insiders"], ClientOpt::VsCodeInsiders => &["code-insiders"],
ClientOpt::VsCodium => &["codium"], ClientOpt::VsCodium => &["codium"],
ClientOpt::VsCodeOss => &["code-oss"], ClientOpt::VsCodeOss => &["code-oss"],
ClientOpt::Any => &["code", "code-insiders", "codium", "code-oss"], ClientOpt::Any => &["code", "code-exploration", "code-insiders", "codium", "code-oss"],
} }
} }
} }
@ -44,11 +46,17 @@ impl std::str::FromStr for ClientOpt {
type Err = anyhow::Error; type Err = anyhow::Error;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
[ClientOpt::VsCode, ClientOpt::VsCodeInsiders, ClientOpt::VsCodium, ClientOpt::VsCodeOss] [
.iter() ClientOpt::VsCode,
.copied() ClientOpt::VsCodeExploration,
.find(|c| [s] == c.as_cmds()) ClientOpt::VsCodeInsiders,
.ok_or_else(|| anyhow::format_err!("no such client")) ClientOpt::VsCodium,
ClientOpt::VsCodeOss,
]
.iter()
.copied()
.find(|c| [s] == c.as_cmds())
.ok_or_else(|| anyhow::format_err!("no such client"))
} }
} }