Finding @T impls near T definition.

starkware-libs · Jan 8, 2025 · b0b026e · b0b026e
1 parent 536872b
commit b0b026e
Show file tree

Hide file tree

Showing 29 changed files with 236 additions and 244 deletions.
diff --git a/corelib/src/ops.cairo b/corelib/src/ops.cairo
@@ -4,9 +4,9 @@ pub use index::{Index, IndexView};
 mod arith;
 pub use arith::{AddAssign, DivAssign, MulAssign, RemAssign, SubAssign};
 mod deref;
+pub use deref::Deref;
 #[feature("deref_mut")]
 pub use deref::DerefMut;
-pub use deref::{Deref, SnapshotDeref};
 mod range;
 // `RangeOp` is used internally by the compiler.
 #[allow(unused_imports)]

diff --git a/corelib/src/ops/deref.cairo b/corelib/src/ops/deref.cairo
@@ -98,25 +98,6 @@ pub trait DerefMut<T> {
     fn deref_mut(ref self: T) -> Self::Target;
 }
 
-/// A helper trait for dereferencing a snapshot of a type. Should not be implemented for copyable
-/// types.
-pub trait SnapshotDeref<T> {
-    /// The type of the dereferenced value.
-    type Target;
-    /// Returns the dereferenced value.
-    fn snapshot_deref(self: @T) -> Self::Target;
-}
-
-/// Implementation of `Deref` for snapshots that implement `SnapshotDeref`.
-// TODO(Gil): Add a negative impl for Copy types, it is not working right now when T is a generic
-// type.
-impl SnapshotDerefHelper<T, +SnapshotDeref<T>> of Deref<@T> {
-    type Target = SnapshotDeref::<T>::Target;
-    fn deref(self: @T) -> Self::Target {
-        self.snapshot_deref()
-    }
-}
-
 /// Implementation of `Deref` for copyable snapshots.
 // TODO(Gil): This should not use the `*` operator as the `*` operator will later be calling
 // `Deref`.

diff --git a/crates/cairo-lang-semantic/src/expr/inference/solver.rs b/crates/cairo-lang-semantic/src/expr/inference/solver.rs
@@ -138,24 +138,35 @@ pub fn enrich_lookup_context(
     // Add the defining module of the generic args to the lookup.
     for generic_arg in &generic_args {
         if let GenericArgumentId::Type(ty) = generic_arg {
-            match ty.lookup_intern(db) {
-                TypeLongId::Concrete(concrete) => {
-                    lookup_context
-                        .insert_module(concrete.generic_type(db).module_file_id(db.upcast()).0);
-                }
-                TypeLongId::Coupon(function_id) => {
-                    if let Some(module_file_id) =
-                        function_id.get_concrete(db).generic_function.module_file_id(db)
-                    {
-                        lookup_context.insert_module(module_file_id.0);
-                    }
-                }
-                TypeLongId::ImplType(impl_type_id) => {
-                    lookup_context.insert_impl(impl_type_id.impl_id());
-                }
-                _ => (),
+            enrich_lookup_context_with_ty(db, *ty, lookup_context);
+        }
+    }
+}
+
+/// Adds the defining module of the type to the lookup context.
+fn enrich_lookup_context_with_ty(
+    db: &dyn SemanticGroup,
+    ty: TypeId,
+    lookup_context: &mut ImplLookupContext,
+) {
+    match ty.lookup_intern(db) {
+        TypeLongId::Concrete(concrete) => {
+            lookup_context.insert_module(concrete.generic_type(db).module_file_id(db.upcast()).0);
+        }
+        TypeLongId::Coupon(function_id) => {
+            if let Some(module_file_id) =
+                function_id.get_concrete(db).generic_function.module_file_id(db)
+            {
+                lookup_context.insert_module(module_file_id.0);
             }
         }
+        TypeLongId::ImplType(impl_type_id) => {
+            lookup_context.insert_impl(impl_type_id.impl_id());
+        }
+        TypeLongId::Snapshot(ty) => {
+            enrich_lookup_context_with_ty(db, ty, lookup_context);
+        }
+        _ => (),
     }
 }
 

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component
@@ -906,9 +906,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/diagnostics b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/diagnostics
@@ -87,9 +87,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -271,9 +271,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -455,9 +455,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -635,9 +635,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -815,9 +815,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -999,9 +999,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -1182,9 +1182,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -1358,9 +1358,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -1546,9 +1546,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -1779,9 +1779,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }
@@ -1963,9 +1963,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as
@@ -651,9 +651,9 @@ pub struct ComponentState<TContractState> {
 
 impl ComponentStateDrop<TContractState> of Drop<ComponentState<TContractState>> {}
 
-impl ComponentStateDeref<TContractState> of core::ops::SnapshotDeref<ComponentState<TContractState>> {
+impl ComponentStateDeref<TContractState> of core::ops::Deref<@ComponentState<TContractState>> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ComponentState<TContractState>) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract
@@ -148,9 +148,9 @@ pub struct ContractState {
 
 impl ContractStateDrop of Drop<ContractState> {}
 
-impl ContractStateDeref of core::ops::SnapshotDeref<ContractState> {
+impl ContractStateDeref of core::ops::Deref<@ContractState> {
     type Target = starknet::storage::FlattenedStorage<Storage>;
-    fn snapshot_deref(self: @ContractState) -> starknet::storage::FlattenedStorage<Storage> {
+    fn deref(self: @ContractState) -> starknet::storage::FlattenedStorage<Storage> {
         starknet::storage::FlattenedStorage {}
     }
 }