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

chore: rename salsa to ra_salsa

Browse source
This commit is contained in:
David Barsky 2024-10-04 15:48:11 -04:00
parent 7b2548bd8d
commit ccee36e8dd
104 changed files with 540 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/span/src/hygiene.rs
View file

@ -21,7 +21,7 @@
//! `ExpnData::call_site` in rustc, [`MacroCallLoc::call_site`] in rust-analyzer.
use std::fmt;
use salsa::{InternId, InternValue};
use ra_salsa::{InternId, InternValue};
use crate::MacroCallId;
@ -39,11 +39,11 @@ impl fmt::Debug for SyntaxContextId {
}
}
impl salsa::InternKey for SyntaxContextId {
fn from_intern_id(v: salsa::InternId) -> Self {
impl ra_salsa::InternKey for SyntaxContextId {
fn from_intern_id(v: ra_salsa::InternId) -> Self {
SyntaxContextId(v)
}
fn as_intern_id(&self) -> salsa::InternId {
fn as_intern_id(&self) -> ra_salsa::InternId {
self.0
}
}

10
crates/span/src/lib.rs
View file

@ -1,7 +1,7 @@
//! File and span related types.
use std::fmt::{self, Write};
use salsa::InternId;
use ra_salsa::InternId;
mod ast_id;
mod hygiene;
@ -261,13 +261,13 @@ pub struct MacroFileId {
/// `MacroCallId` identifies a particular macro invocation, like
/// `println!("Hello, {}", world)`.
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct MacroCallId(salsa::InternId);
pub struct MacroCallId(ra_salsa::InternId);
impl salsa::InternKey for MacroCallId {
fn from_intern_id(v: salsa::InternId) -> Self {
impl ra_salsa::InternKey for MacroCallId {
fn from_intern_id(v: ra_salsa::InternId) -> Self {
MacroCallId(v)
}
fn as_intern_id(&self) -> salsa::InternId {
fn as_intern_id(&self) -> ra_salsa::InternId {
self.0
}
}