bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-srv/src/lib.rs')
-rw-r--r--crates/proc-macro-srv/src/lib.rs32
1 files changed, 5 insertions, 27 deletions
diff --git a/crates/proc-macro-srv/src/lib.rs b/crates/proc-macro-srv/src/lib.rs
index 22afa018de..223c5a54b7 100644
--- a/crates/proc-macro-srv/src/lib.rs
+++ b/crates/proc-macro-srv/src/lib.rs
@@ -41,7 +41,7 @@ use std::{
};
use paths::{Utf8Path, Utf8PathBuf};
-use span::{ErasedFileAstId, FIXUP_ERASED_FILE_AST_ID_MARKER, Span, TokenId};
+use span::{Span, TokenId};
use crate::server_impl::TokenStream;
@@ -57,16 +57,11 @@ pub const RUSTC_VERSION_STRING: &str = env!("RUSTC_VERSION");
pub struct ProcMacroSrv<'env> {
expanders: Mutex<HashMap<Utf8PathBuf, Arc<dylib::Expander>>>,
env: &'env EnvSnapshot,
- fixup_ast_id: ErasedFileAstId,
}
impl<'env> ProcMacroSrv<'env> {
pub fn new(env: &'env EnvSnapshot) -> Self {
- Self { expanders: Default::default(), env, fixup_ast_id: FIXUP_ERASED_FILE_AST_ID_MARKER }
- }
-
- pub fn set_fixup_ast_id(&mut self, fixup_ast_id: u32) {
- self.fixup_ast_id = ErasedFileAstId::from_raw(fixup_ast_id);
+ Self { expanders: Default::default(), env }
}
}
@@ -106,7 +101,6 @@ impl ProcMacroSrv<'_> {
def_site,
call_site,
mixed_site,
- self.fixup_ast_id,
)
.map(|tt| tt.0)
});
@@ -162,41 +156,25 @@ impl ProcMacroSrv<'_> {
pub trait ProcMacroSrvSpan: Copy + Send {
type Server: proc_macro::bridge::server::Server<TokenStream = TokenStream<Self>>;
- fn make_server(
- call_site: Self,
- def_site: Self,
- mixed_site: Self,
- fixup_ast_id: ErasedFileAstId,
- ) -> Self::Server;
+ fn make_server(call_site: Self, def_site: Self, mixed_site: Self) -> Self::Server;
}
impl ProcMacroSrvSpan for TokenId {
type Server = server_impl::token_id::TokenIdServer;
- fn make_server(
- call_site: Self,
- def_site: Self,
- mixed_site: Self,
- _fixup_ast_id: ErasedFileAstId,
- ) -> Self::Server {
+ fn make_server(call_site: Self, def_site: Self, mixed_site: Self) -> Self::Server {
Self::Server { call_site, def_site, mixed_site }
}
}
impl ProcMacroSrvSpan for Span {
type Server = server_impl::rust_analyzer_span::RaSpanServer;
- fn make_server(
- call_site: Self,
- def_site: Self,
- mixed_site: Self,
- fixup_ast_id: ErasedFileAstId,
- ) -> Self::Server {
+ fn make_server(call_site: Self, def_site: Self, mixed_site: Self) -> Self::Server {
Self::Server {
call_site,
def_site,
mixed_site,
tracked_env_vars: Default::default(),
tracked_paths: Default::default(),
- fixup_ast_id,
}
}
}