Merge pull request #736 from Veykril/veykril/push-mntwomxrrovr

Veykril · web-flow · commit 26aeeec9b15e · 2025-02-26T12:26:38.000Z
Remove unnecessary `current_revision` call from `setup_interned_struct`
diff --git a/components/salsa-macro-rules/src/setup_interned_struct.rs b/components/salsa-macro-rules/src/setup_interned_struct.rs
@@ -207,7 +207,6 @@ macro_rules! setup_interned_struct {
                         $field_ty: $zalsa::interned::HashEqLike<$indexed_ty>,
                     )*
                 {
-                    let current_revision = $zalsa::current_revision(db);
                     $Configuration::ingredient(db).intern(db.as_dyn_database(),
                         StructKey::<$db_lt>($($field_id,)* std::marker::PhantomData::default()), |_, data| ($($zalsa::interned::Lookup::into_owned(data.$field_index),)*))
                 }
diff --git a/tests/interned-structs_self_ref.rs b/tests/interned-structs_self_ref.rs
@@ -149,7 +149,6 @@ const _: () = {
             Db_: ?Sized + salsa::Database,
             String: zalsa_::interned::HashEqLike<T0>,
         {
-            let current_revision = zalsa_::current_revision(db);
             Configuration_::ingredient(db).intern(
                 db.as_dyn_database(),
                 StructKey::<'db>(data, std::marker::PhantomData::default()),

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,6 @@ macro_rules! setup_interned_struct {`
`207`	`207`	`$field_ty: $zalsa::interned::HashEqLike<$indexed_ty>,`
`208`	`208`	`)*`
`209`	`209`	`{`
`210`		`- let current_revision = $zalsa::current_revision(db);`
`211`	`210`	`$Configuration::ingredient(db).intern(db.as_dyn_database(),`
`212`	`211`	`StructKey::<$db_lt>($($field_id,)* std::marker::PhantomData::default()), \|_, data\| ($($zalsa::interned::Lookup::into_owned(data.$field_index),)*))`
`213`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,6 @@ const _: () = {`
`149`	`149`	`Db_: ?Sized + salsa::Database,`
`150`	`150`	`String: zalsa_::interned::HashEqLike<T0>,`
`151`	`151`	`{`
`152`		`- let current_revision = zalsa_::current_revision(db);`
`153`	`152`	`Configuration_::ingredient(db).intern(`
`154`	`153`	`db.as_dyn_database(),`
`155`	`154`	`StructKey::<'db>(data, std::marker::PhantomData::default()),`