Skip to content

Commit

Permalink
Change mutable_* to *_mut. (#6028)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gilbens-starkware
gilbens-starkware committed Jul 16, 2024
1 parent 00b2ee4 commit bd44f91
Show file tree
Hide file tree
Showing 21 changed files with 146 additions and 146 deletions.
10 changes: 5 additions & 5 deletions corelib/src/starknet/storage.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ impl StorageNodeDeref<T, +StorageNode<T>> of core::ops::Deref<StoragePath<T>> {
/// A mutable version of `StorageNode`, works the same way, but on `Mutable<T>`.
pub trait MutableStorageNode<T> {
type NodeType;
fn mutable_storage_node(self: StoragePath<Mutable<T>>) -> Self::NodeType;
fn storage_node_mut(self: StoragePath<Mutable<T>>) -> Self::NodeType;
}

/// This makes the storage node members directly accessible from a path to the parent struct.
Expand All @@ -377,7 +377,7 @@ impl MutableStorageNodeDeref<
> of core::ops::Deref<StoragePath<Mutable<T>>> {
type Target = MutableStorageNode::<T>::NodeType;
fn deref(self: StoragePath<Mutable<T>>) -> Self::Target {
self.mutable_storage_node()
self.storage_node_mut()
}
}

Expand All @@ -404,7 +404,7 @@ pub trait MutableSubPointers<T> {
/// The type of the storage pointers, generated for the struct T.
type SubPointersType;
/// Creates a sub pointers struct for the given storage pointer to a struct T.
fn mutable_sub_pointers(self: StoragePointer<Mutable<T>>) -> Self::SubPointersType;
fn sub_pointers_mut(self: StoragePointer<Mutable<T>>) -> Self::SubPointersType;
}

/// This makes the sub-pointers members directly accessible from a pointer to the parent struct.
Expand All @@ -413,7 +413,7 @@ impl MutableSubPointersDeref<
> of core::ops::Deref<StoragePointer<Mutable<T>>> {
type Target = MutableSubPointers::<T>::SubPointersType;
fn deref(self: StoragePointer<Mutable<T>>) -> Self::Target {
self.mutable_sub_pointers()
self.sub_pointers_mut()
}
}

Expand Down Expand Up @@ -622,7 +622,7 @@ struct MutableU256SubPointers {

impl MutableU256SubPointersImpl of starknet::storage::MutableSubPointers<u256> {
type SubPointersType = MutableU256SubPointers;
fn mutable_sub_pointers(
fn sub_pointers_mut(
self: starknet::storage::StoragePointer<Mutable<u256>>
) -> MutableU256SubPointers {
let base_address = self.address;
Expand Down
2 changes: 1 addition & 1 deletion crates/cairo-lang-starknet/cairo_level_tests/contracts/with_erc20_mini.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ mod erc20_mini_contract {
fn storage_mut(
ref self: ContractState
) -> MutableStorageNode::<erc20_mini::ERC20Storage>::NodeType {
self.erc20_token.as_path().mutable_storage_node()
self.erc20_token.as_path().storage_node_mut()
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/cairo-lang-starknet/cairo_level_tests/contracts/with_ownable_mini.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ mod ownable_mini_contract {
fn storage_mut(
ref self: ContractState
) -> MutableStorageNode::<ownable_mini::OwnableStorage>::NodeType {
self.ownable.as_path().mutable_storage_node()
self.ownable.as_path().storage_node_mut()
}
}

Expand Down
10 changes: 5 additions & 5 deletions crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ struct MutableMyTypeSubPointers {
}
impl MutableMyTypeSubPointersImpl of starknet::storage::MutableSubPointers<MyType> {
type SubPointersType = MutableMyTypeSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyType>>) -> MutableMyTypeSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyType>>) -> MutableMyTypeSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let x_value = starknet::storage::StoragePointer {
Expand Down Expand Up @@ -451,7 +451,7 @@ struct MutableMyTraitDispatcherSubPointers {
}
impl MutableMyTraitDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitDispatcher> {
type SubPointersType = MutableMyTraitDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitDispatcher>>) -> MutableMyTraitDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitDispatcher>>) -> MutableMyTraitDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let contract_address_value = starknet::storage::StoragePointer {
Expand Down Expand Up @@ -545,7 +545,7 @@ struct MutableMyTraitLibraryDispatcherSubPointers {
}
impl MutableMyTraitLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitLibraryDispatcher> {
type SubPointersType = MutableMyTraitLibraryDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitLibraryDispatcher>>) -> MutableMyTraitLibraryDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitLibraryDispatcher>>) -> MutableMyTraitLibraryDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let class_hash_value = starknet::storage::StoragePointer {
Expand Down Expand Up @@ -639,7 +639,7 @@ struct MutableMyTraitSafeLibraryDispatcherSubPointers {
}
impl MutableMyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitSafeLibraryDispatcher> {
type SubPointersType = MutableMyTraitSafeLibraryDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeLibraryDispatcher>>) -> MutableMyTraitSafeLibraryDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeLibraryDispatcher>>) -> MutableMyTraitSafeLibraryDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let class_hash_value = starknet::storage::StoragePointer {
Expand Down Expand Up @@ -733,7 +733,7 @@ struct MutableMyTraitSafeDispatcherSubPointers {
}
impl MutableMyTraitSafeDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitSafeDispatcher> {
type SubPointersType = MutableMyTraitSafeDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeDispatcher>>) -> MutableMyTraitSafeDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeDispatcher>>) -> MutableMyTraitSafeDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let contract_address_value = starknet::storage::StoragePointer {
Expand Down
8 changes: 4 additions & 4 deletions crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ struct MutableMyTraitDispatcherSubPointers {
}
impl MutableMyTraitDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitDispatcher> {
type SubPointersType = MutableMyTraitDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitDispatcher>>) -> MutableMyTraitDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitDispatcher>>) -> MutableMyTraitDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let contract_address_value = starknet::storage::StoragePointer {
Expand Down Expand Up @@ -317,7 +317,7 @@ struct MutableMyTraitLibraryDispatcherSubPointers {
}
impl MutableMyTraitLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitLibraryDispatcher> {
type SubPointersType = MutableMyTraitLibraryDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitLibraryDispatcher>>) -> MutableMyTraitLibraryDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitLibraryDispatcher>>) -> MutableMyTraitLibraryDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let class_hash_value = starknet::storage::StoragePointer {
Expand Down Expand Up @@ -411,7 +411,7 @@ struct MutableMyTraitSafeLibraryDispatcherSubPointers {
}
impl MutableMyTraitSafeLibraryDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitSafeLibraryDispatcher> {
type SubPointersType = MutableMyTraitSafeLibraryDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeLibraryDispatcher>>) -> MutableMyTraitSafeLibraryDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeLibraryDispatcher>>) -> MutableMyTraitSafeLibraryDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let class_hash_value = starknet::storage::StoragePointer {
Expand Down Expand Up @@ -505,7 +505,7 @@ struct MutableMyTraitSafeDispatcherSubPointers {
}
impl MutableMyTraitSafeDispatcherSubPointersImpl of starknet::storage::MutableSubPointers<MyTraitSafeDispatcher> {
type SubPointersType = MutableMyTraitSafeDispatcherSubPointers;
fn mutable_sub_pointers(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeDispatcher>>) -> MutableMyTraitSafeDispatcherSubPointers {
fn sub_pointers_mut(self: starknet::storage::StoragePointer<starknet::storage::Mutable::<MyTraitSafeDispatcher>>) -> MutableMyTraitSafeDispatcherSubPointers {
let base_address = self.address;
let mut current_offset = self.offset;
let contract_address_value = starknet::storage::StoragePointer {
Expand Down

0 comments on commit bd44f91

Please sign in to comment.