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

Infect proc-macro-api crate with generic span type parameter

Browse source
This commit is contained in:
Lukas Wirth 2023-06-29 12:23:45 +02:00
parent 83f91f61b1
commit f79439caed
3 changed files with 181 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/proc-macro-api/src/lib.rs
View file

@ -17,10 +17,8 @@ use triomphe::Arc;
use serde::{Deserialize, Serialize};
use ::tt::token_id as tt;
use crate::{
msg::{ExpandMacro, FlatTree, PanicMessage},
msg::{flat::SerializableSpan, ExpandMacro, FlatTree, PanicMessage},
process::ProcMacroProcessSrv,
};
@ -134,12 +132,12 @@ impl ProcMacro {
self.kind
}
pub fn expand(
pub fn expand<const L: usize, S: SerializableSpan<L>>(
&self,
subtree: &tt::Subtree,
attr: Option<&tt::Subtree>,
subtree: &tt::Subtree<S>,
attr: Option<&tt::Subtree<S>>,
env: Vec<(String, String)>,
) -> Result<Result<tt::Subtree, PanicMessage>, ServerError> {
) -> Result<Result<tt::Subtree<S>, PanicMessage>, ServerError> {
let version = self.process.lock().unwrap_or_else(|e| e.into_inner()).version();
let current_dir = env
.iter()