update rust-analyzer to new interned struct

Author: davidbarsky

Cargo.lock

@@ -135,7 +135,7 @@ process-wrap = { version = "8.0.2", features = ["std"] }
 pulldown-cmark-to-cmark = "10.0.4"
 pulldown-cmark = { version = "0.9.0", default-features = false }
 rayon = "1.8.0"
-salsa = { git = "https://github.com/davidbarsky/salsa.git", branch = "chayim-david-lukas/salsa-perf-improvements" }
+salsa = { git = "https://github.com/davidbarsky/salsa.git", branch = "chayim-david-lukas/salsa-changes-for-ra" }
 db-ext-macro = { git = "https://github.com/davidbarsky/db-ext-macro.git", rev = "c88f2f058ac4e6a8a09e87e41d7b30b147235514" }
 rustc-hash = "2.0.0"
 semver = "1.0.14"

Cargo.toml

@@ -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,

crates/base-db/src/lib.rs

@@ -560,7 +560,7 @@ pub enum ItemContainerId {
 impl_from!(ModuleId for ItemContainerId);
 
 /// A Data Type
-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::supertype)]
 pub enum AdtId {
     StructId(StructId),
     UnionId(UnionId),
@@ -569,7 +569,7 @@ pub enum AdtId {
 impl_from!(StructId, UnionId, EnumId for AdtId);
 
 /// A macro
-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::supertype)]
 pub enum MacroId {
     Macro2Id(Macro2Id),
     MacroRulesId(MacroRulesId),
@@ -825,7 +825,7 @@ impl GeneralConstId {
 }
 
 /// The defs which have a body.
-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::supertype)]
 pub enum DefWithBodyId {
     FunctionId(FunctionId),
     StaticId(StaticId),
@@ -868,7 +868,7 @@ pub enum AssocItemId {
 // casting them, and somehow making the constructors private, which would be annoying.
 impl_from!(FunctionId, ConstId, TypeAliasId for AssocItemId);
 
-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::supertype)]
 pub enum GenericDefId {
     AdtId(AdtId),
     // consts can have type parameters from their parents (i.e. associated consts of traits)
@@ -957,7 +957,7 @@ impl From<AssocItemId> for GenericDefId {
     }
 }
 
-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::supertype)]
 pub enum CallableDefId {
     FunctionId(FunctionId),
     StructId(StructId),
@@ -1073,7 +1073,7 @@ impl From<VariantId> for AttrDefId {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::supertype)]
 pub enum VariantId {
     EnumVariantId(EnumVariantId),
     StructId(StructId),

crates/hir-def/src/lib.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,
 }

crates/hir-expand/src/db.rs

@@ -2463,7 +2463,7 @@ pub enum TyDefId {
 }
 impl_from!(BuiltinType, AdtId(StructId, EnumId, UnionId), TypeAliasId for TyDefId);
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::supertype)]
 pub enum ValueTyDefId {
     FunctionId(FunctionId),
     StructId(StructId),