bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/span/src/hygiene.rs')
-rw-r--r--crates/span/src/hygiene.rs51
1 files changed, 25 insertions, 26 deletions
diff --git a/crates/span/src/hygiene.rs b/crates/span/src/hygiene.rs
index fe05ef9465..0a81cef52e 100644
--- a/crates/span/src/hygiene.rs
+++ b/crates/span/src/hygiene.rs
@@ -81,25 +81,24 @@ const _: () = {
#[derive(Hash)]
struct StructKey<'db, T0, T1, T2, T3>(T0, T1, T2, T3, std::marker::PhantomData<&'db ()>);
- impl<'db, T0, T1, T2, T3> zalsa_::interned::HashEqLike<StructKey<'db, T0, T1, T2, T3>>
- for SyntaxContextData
+ impl<'db, T0, T1, T2, T3> zalsa_::HashEqLike<StructKey<'db, T0, T1, T2, T3>> for SyntaxContextData
where
- Option<MacroCallId>: zalsa_::interned::HashEqLike<T0>,
- Transparency: zalsa_::interned::HashEqLike<T1>,
- Edition: zalsa_::interned::HashEqLike<T2>,
- SyntaxContext: zalsa_::interned::HashEqLike<T3>,
+ Option<MacroCallId>: zalsa_::HashEqLike<T0>,
+ Transparency: zalsa_::HashEqLike<T1>,
+ Edition: zalsa_::HashEqLike<T2>,
+ SyntaxContext: zalsa_::HashEqLike<T3>,
{
fn hash<H: std::hash::Hasher>(&self, h: &mut H) {
- zalsa_::interned::HashEqLike::<T0>::hash(&self.outer_expn, &mut *h);
- zalsa_::interned::HashEqLike::<T1>::hash(&self.outer_transparency, &mut *h);
- zalsa_::interned::HashEqLike::<T2>::hash(&self.edition, &mut *h);
- zalsa_::interned::HashEqLike::<T3>::hash(&self.parent, &mut *h);
+ zalsa_::HashEqLike::<T0>::hash(&self.outer_expn, &mut *h);
+ zalsa_::HashEqLike::<T1>::hash(&self.outer_transparency, &mut *h);
+ zalsa_::HashEqLike::<T2>::hash(&self.edition, &mut *h);
+ zalsa_::HashEqLike::<T3>::hash(&self.parent, &mut *h);
}
fn eq(&self, data: &StructKey<'db, T0, T1, T2, T3>) -> bool {
- zalsa_::interned::HashEqLike::<T0>::eq(&self.outer_expn, &data.0)
- && zalsa_::interned::HashEqLike::<T1>::eq(&self.outer_transparency, &data.1)
- && zalsa_::interned::HashEqLike::<T2>::eq(&self.edition, &data.2)
- && zalsa_::interned::HashEqLike::<T3>::eq(&self.parent, &data.3)
+ zalsa_::HashEqLike::<T0>::eq(&self.outer_expn, &data.0)
+ && zalsa_::HashEqLike::<T1>::eq(&self.outer_transparency, &data.1)
+ && zalsa_::HashEqLike::<T2>::eq(&self.edition, &data.2)
+ && zalsa_::HashEqLike::<T3>::eq(&self.parent, &data.3)
}
}
impl zalsa_struct_::Configuration for SyntaxContext {
@@ -203,10 +202,10 @@ const _: () = {
impl<'db> SyntaxContext {
pub fn new<
Db,
- T0: zalsa_::interned::Lookup<Option<MacroCallId>> + std::hash::Hash,
- T1: zalsa_::interned::Lookup<Transparency> + std::hash::Hash,
- T2: zalsa_::interned::Lookup<Edition> + std::hash::Hash,
- T3: zalsa_::interned::Lookup<SyntaxContext> + std::hash::Hash,
+ T0: zalsa_::Lookup<Option<MacroCallId>> + std::hash::Hash,
+ T1: zalsa_::Lookup<Transparency> + std::hash::Hash,
+ T2: zalsa_::Lookup<Edition> + std::hash::Hash,
+ T3: zalsa_::Lookup<SyntaxContext> + std::hash::Hash,
>(
db: &'db Db,
outer_expn: T0,
@@ -218,10 +217,10 @@ const _: () = {
) -> Self
where
Db: ?Sized + salsa::Database,
- Option<MacroCallId>: zalsa_::interned::HashEqLike<T0>,
- Transparency: zalsa_::interned::HashEqLike<T1>,
- Edition: zalsa_::interned::HashEqLike<T2>,
- SyntaxContext: zalsa_::interned::HashEqLike<T3>,
+ Option<MacroCallId>: zalsa_::HashEqLike<T0>,
+ Transparency: zalsa_::HashEqLike<T1>,
+ Edition: zalsa_::HashEqLike<T2>,
+ SyntaxContext: zalsa_::HashEqLike<T3>,
{
let (zalsa, zalsa_local) = db.zalsas();
@@ -236,10 +235,10 @@ const _: () = {
std::marker::PhantomData,
),
|id, data| SyntaxContextData {
- outer_expn: zalsa_::interned::Lookup::into_owned(data.0),
- outer_transparency: zalsa_::interned::Lookup::into_owned(data.1),
- edition: zalsa_::interned::Lookup::into_owned(data.2),
- parent: zalsa_::interned::Lookup::into_owned(data.3),
+ outer_expn: zalsa_::Lookup::into_owned(data.0),
+ outer_transparency: zalsa_::Lookup::into_owned(data.1),
+ edition: zalsa_::Lookup::into_owned(data.2),
+ parent: zalsa_::Lookup::into_owned(data.3),
opaque: opaque(zalsa_::FromId::from_id(id)),
opaque_and_semiopaque: opaque_and_semiopaque(zalsa_::FromId::from_id(id)),
},