Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add cargo xtask install proc-macro-server

Browse source
This commit is contained in:
Lukas Wirth 2024-07-15 12:33:51 +02:00
parent e846c04fbe
commit c0136070a7
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ide/src/hover.rs
View file

@ -240,7 +240,7 @@ fn hover_simple(
.flatten() .flatten()
.unique_by(|&(def, _, _)| def) .unique_by(|&(def, _, _)| def)
.map(|(def, macro_arm, node)| { .map(|(def, macro_arm, node)| {
dbg!(hover_for_definition(sema, file_id, def, &node, macro_arm, config)) hover_for_definition(sema, file_id, def, &node, macro_arm, config)
}) })
.reduce(|mut acc: HoverResult, HoverResult { markup, actions }| { .reduce(|mut acc: HoverResult, HoverResult { markup, actions }| {
acc.actions.extend(actions); acc.actions.extend(actions);

17
xtask/src/flags.rs
View file

@ -2,7 +2,7 @@
use std::{fmt, str::FromStr}; use std::{fmt, str::FromStr};
use crate::install::{ClientOpt, ServerOpt}; use crate::install::{ClientOpt, ProcMacroServerOpt, ServerOpt};
xflags::xflags! { xflags::xflags! {
src "./src/flags.rs" src "./src/flags.rs"
@ -23,6 +23,10 @@ xflags::xflags! {
optional --mimalloc optional --mimalloc
/// Use jemalloc allocator for server. /// Use jemalloc allocator for server.
optional --jemalloc optional --jemalloc
/// Install the proc-macro server.
optional --proc-macro-server
/// build in release with debug info set to 2. /// build in release with debug info set to 2.
optional --dev-rel optional --dev-rel
} }
@ -109,6 +113,7 @@ pub struct Install {
pub client: bool, pub client: bool,
pub code_bin: Option<String>, pub code_bin: Option<String>,
pub server: bool, pub server: bool,
pub proc_macro_server: bool,
pub mimalloc: bool, pub mimalloc: bool,
pub jemalloc: bool, pub jemalloc: bool,
pub dev_rel: bool, pub dev_rel: bool,
@ -284,7 +289,7 @@ impl Malloc {
impl Install { impl Install {
pub(crate) fn server(&self) -> Option<ServerOpt> { pub(crate) fn server(&self) -> Option<ServerOpt> {
if self.client && !self.server { if !self.server {
return None; return None;
} }
let malloc = if self.mimalloc { let malloc = if self.mimalloc {
@ -296,8 +301,14 @@ impl Install {
}; };
Some(ServerOpt { malloc, dev_rel: self.dev_rel }) Some(ServerOpt { malloc, dev_rel: self.dev_rel })
} }
pub(crate) fn proc_macro_server(&self) -> Option<ProcMacroServerOpt> {
if !self.proc_macro_server {
return None;
}
Some(ProcMacroServerOpt { dev_rel: self.dev_rel })
}
pub(crate) fn client(&self) -> Option<ClientOpt> { pub(crate) fn client(&self) -> Option<ClientOpt> {
if !self.client && self.server { if !self.client {
return None; return None;
} }
Some(ClientOpt { code_bin: self.code_bin.clone() }) Some(ClientOpt { code_bin: self.code_bin.clone() })

15
xtask/src/install.rs
View file

@ -15,6 +15,9 @@ impl flags::Install {
if let Some(server) = self.server() { if let Some(server) = self.server() {
install_server(sh, server).context("install server")?; install_server(sh, server).context("install server")?;
} }
if let Some(server) = self.proc_macro_server() {
install_proc_macro_server(sh, server).context("install proc-macro server")?;
}
if let Some(client) = self.client() { if let Some(client) = self.client() {
install_client(sh, client).context("install client")?; install_client(sh, client).context("install client")?;
} }
@ -34,6 +37,10 @@ pub(crate) struct ServerOpt {
pub(crate) dev_rel: bool, pub(crate) dev_rel: bool,
} }
pub(crate) struct ProcMacroServerOpt {
pub(crate) dev_rel: bool,
}
fn fix_path_for_mac(sh: &Shell) -> anyhow::Result<()> { fn fix_path_for_mac(sh: &Shell) -> anyhow::Result<()> {
let mut vscode_path: Vec<PathBuf> = { let mut vscode_path: Vec<PathBuf> = {
const COMMON_APP_PATH: &str = const COMMON_APP_PATH: &str =
@ -132,3 +139,11 @@ fn install_server(sh: &Shell, opts: ServerOpt) -> anyhow::Result<()> {
cmd.run()?; cmd.run()?;
Ok(()) Ok(())
} }
fn install_proc_macro_server(sh: &Shell, opts: ProcMacroServerOpt) -> anyhow::Result<()> {
let profile = if opts.dev_rel { "dev-rel" } else { "release" };
let cmd = cmd!(sh, "cargo +nightly install --path crates/proc-macro-srv-cli --profile={profile} --locked --force --features sysroot-abi");
cmd.run()?;
Ok(())
}