language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-02 04:48:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Properly clean proc-macro-srv proc-macro temp dir

Browse source
This commit is contained in:
Lukas Wirth 2025-07-31 09:26:05 +02:00
parent 4d5bb86ad7
commit a7a365e8f8
8 changed files with 125 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/proc-macro-srv-cli/Cargo.toml
View file

@ -15,10 +15,13 @@ proc-macro-srv.workspace = true
proc-macro-api.workspace = true
tt.workspace = true
clap = {version = "4.5.42", default-features = false, features = ["std"]}
postcard = { version = "1.1.3", optional = true }
[features]
default = ["postcard"]
sysroot-abi = ["proc-macro-srv/sysroot-abi"]
in-rust-tree = ["proc-macro-srv/in-rust-tree", "sysroot-abi"]
postcard = ["dep:postcard"]
[[bin]]

3
crates/proc-macro-srv-cli/src/main.rs
View file

@ -39,6 +39,7 @@ fn main() -> std::io::Result<()> {
#[derive(Copy, Clone)]
enum ProtocolFormat {
Json,
#[cfg(feature = "postcard")]
Postcard,
}
@ -50,12 +51,14 @@ impl ValueEnum for ProtocolFormat {
fn to_possible_value(&self) -> Option<clap::builder::PossibleValue> {
match self {
ProtocolFormat::Json => Some(clap::builder::PossibleValue::new("json")),
#[cfg(feature = "postcard")]
ProtocolFormat::Postcard => Some(clap::builder::PossibleValue::new("postcard")),
}
}
fn from_str(input: &str, _ignore_case: bool) -> Result<Self, String> {
match input {
"json" => Ok(ProtocolFormat::Json),
#[cfg(feature = "postcard")]
"postcard" => Ok(ProtocolFormat::Postcard),
_ => Err(format!("unknown protocol format: {input}")),
}

5
crates/proc-macro-srv-cli/src/main_loop.rs
View file

@ -37,6 +37,7 @@ impl SpanTransformer for SpanTrans {
pub(crate) fn run(format: ProtocolFormat) -> io::Result<()> {
match format {
ProtocolFormat::Json => run_json(),
#[cfg(feature = "postcard")]
ProtocolFormat::Postcard => unimplemented!(),
}
}
@ -96,7 +97,7 @@ fn run_json() -> io::Result<()> {
srv.expand(
lib,
env,
&env,
current_dir,
macro_name,
macro_body,
@ -127,7 +128,7 @@ fn run_json() -> io::Result<()> {
});
srv.expand(
lib,
env,
&env,
current_dir,
macro_name,
macro_body,