update rust-analyzer to new interned struct

davidbarsky · davidbarsky · commit c85177eee9af · 2025-01-24T13:33:20.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs
@@ -27,7 +27,7 @@ use vfs::{AbsPathBuf, FileId};
 #[macro_export]
 macro_rules! impl_intern_key {
     ($id:ident, $loc:ident) => {
-        #[salsa::interned_sans_lifetime(no_debug)]
+        #[salsa::interned(no_debug, no_lifetime)]
         pub struct $id {
             pub loc: $loc,
         }
@@ -167,7 +167,7 @@ impl Files {
     }
 }
 
-#[salsa::interned_sans_lifetime]
+#[salsa::interned(no_lifetime)]
 pub struct EditionedFileId {
     pub file_id: FileText,
     pub editioned_file_id: span::EditionedFileId,
diff --git a/crates/hir-expand/src/db.rs b/crates/hir-expand/src/db.rs
@@ -152,7 +152,7 @@ pub trait ExpandDatabase: RootQueryDb {
     fn syntax_context(&self, file: HirFileId, edition: Edition) -> SyntaxContextId;
 }
 
-#[salsa::interned_sans_lifetime(id = span::MacroCallId)]
+#[salsa::interned(no_lifetime, id = span::MacroCallId)]
 pub struct MacroCallWrapper {
     pub loc: MacroCallLoc,
 }
@@ -168,7 +168,7 @@ fn lookup_intern_macro_call(db: &dyn ExpandDatabase, macro_call: MacroCallId) ->
         .clone()
 }
 
-#[salsa::interned_sans_lifetime(id = span::SyntaxContextId)]
+#[salsa::interned(no_lifetime, id = span::SyntaxContextId)]
 pub struct SyntaxContextWrapper {
     pub data: SyntaxContextId,
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ use vfs::{AbsPathBuf, FileId};`
`27`	`27`	`#[macro_export]`
`28`	`28`	`macro_rules! impl_intern_key {`
`29`	`29`	`($id:ident, $loc:ident) => {`
`30`		`- #[salsa::interned_sans_lifetime(no_debug)]`
	`30`	`+ #[salsa::interned(no_debug, no_lifetime)]`
`31`	`31`	`pub struct $id {`
`32`	`32`	`pub loc: $loc,`
`33`	`33`	`}`
`@@ -167,7 +167,7 @@ impl Files {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`170`		`-#[salsa::interned_sans_lifetime]`
	`170`	`+#[salsa::interned(no_lifetime)]`
`171`	`171`	`pub struct EditionedFileId {`
`172`	`172`	`pub file_id: FileText,`
`173`	`173`	`pub editioned_file_id: span::EditionedFileId,`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ pub trait ExpandDatabase: RootQueryDb {`
`152`	`152`	`fn syntax_context(&self, file: HirFileId, edition: Edition) -> SyntaxContextId;`
`153`	`153`	`}`
`154`	`154`
`155`		`-#[salsa::interned_sans_lifetime(id = span::MacroCallId)]`
	`155`	`+#[salsa::interned(no_lifetime, id = span::MacroCallId)]`
`156`	`156`	`pub struct MacroCallWrapper {`
`157`	`157`	`pub loc: MacroCallLoc,`
`158`	`158`	`}`
`@@ -168,7 +168,7 @@ fn lookup_intern_macro_call(db: &dyn ExpandDatabase, macro_call: MacroCallId) ->`
`168`	`168`	`.clone()`
`169`	`169`	`}`
`170`	`170`
`171`		`-#[salsa::interned_sans_lifetime(id = span::SyntaxContextId)]`
	`171`	`+#[salsa::interned(no_lifetime, id = span::SyntaxContextId)]`
`172`	`172`	`pub struct SyntaxContextWrapper {`
`173`	`173`	`pub data: SyntaxContextId,`
`174`	`174`	`}`