From 38f1cccef21c1fbd2673b282cb977685d697bc4a Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Sat, 27 Dec 2025 09:43:01 +0530 Subject: [PATCH] make source_text take non mutable reference of self --- .../rust-analyzer/crates/proc-macro-srv-cli/src/main_loop.rs | 2 +- src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs | 2 +- .../crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/rust-analyzer/crates/proc-macro-srv-cli/src/main_loop.rs b/src/tools/rust-analyzer/crates/proc-macro-srv-cli/src/main_loop.rs index d0f3a2b15d62..6ed42204df18 100644 --- a/src/tools/rust-analyzer/crates/proc-macro-srv-cli/src/main_loop.rs +++ b/src/tools/rust-analyzer/crates/proc-macro-srv-cli/src/main_loop.rs @@ -175,7 +175,7 @@ struct ProcMacroClientHandle { } impl proc_macro_srv::ProcMacroClientInterface for ProcMacroClientHandle { - fn source_text(&mut self, file_id: u32, start: u32, end: u32) -> Option { + fn source_text(&self, file_id: u32, start: u32, end: u32) -> Option { self.subreq_tx.send(bidirectional::SubRequest::SourceText { file_id, start, end }).ok()?; match self.subresp_rx.recv().ok()? { diff --git a/src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs b/src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs index 9fb81afdeeb4..ff5623f39ee7 100644 --- a/src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs +++ b/src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs @@ -94,7 +94,7 @@ impl<'env> ProcMacroSrv<'env> { pub type ProcMacroClientHandle = Box; pub trait ProcMacroClientInterface { - fn source_text(&mut self, file_id: u32, start: u32, end: u32) -> Option; + fn source_text(&self, file_id: u32, start: u32, end: u32) -> Option; } const EXPANDER_STACK_SIZE: usize = 8 * 1024 * 1024; diff --git a/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs index 1b496950df1a..5f7c0a52025a 100644 --- a/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs +++ b/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs @@ -156,7 +156,7 @@ impl server::Span for RaSpanServer { let start: u32 = span.range.start().into(); let end: u32 = span.range.end().into(); - self.callback.as_mut()?.source_text(file_id.file_id().index(), start, end) + self.callback.as_ref()?.source_text(file_id.file_id().index(), start, end) } fn parent(&mut self, _span: Self::Span) -> Option {