From 113133c58ee71400d63f89ddc479dbcb1bef1aa6 Mon Sep 17 00:00:00 2001 From: yuvalsw <105596564+yuvalsw@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:26:06 +0300 Subject: [PATCH] Fixed uses of Self in corelib (#5479) --- corelib/src/ec.cairo | 4 +-- corelib/src/felt_252.cairo | 4 +-- corelib/src/integer.cairo | 44 +++++++++++++++---------------- tests/bug_samples/issue3153.cairo | 4 +-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/corelib/src/ec.cairo b/corelib/src/ec.cairo index 70ad65cfde5..ce90af1ad16 100644 --- a/corelib/src/ec.cairo +++ b/corelib/src/ec.cairo @@ -124,7 +124,7 @@ pub impl EcPointImpl of EcPointTrait { /// Creates a new EC point from its (x, y) coordinates. #[inline(always)] fn new(x: felt252, y: felt252) -> Option { - Option::Some(EcPointTrait::new_nz(:x, :y)?.into()) + Option::Some(Self::new_nz(:x, :y)?.into()) } /// Creates a new NonZero EC point from its (x, y) coordinates. #[inline(always)] @@ -134,7 +134,7 @@ pub impl EcPointImpl of EcPointTrait { /// Creates a new EC point from its x coordinate. #[inline(always)] fn new_from_x(x: felt252) -> Option { - Option::Some(EcPointTrait::new_nz_from_x(:x)?.into()) + Option::Some(Self::new_nz_from_x(:x)?.into()) } /// Creates a new NonZero EC point from its x coordinate. #[inline(always)] diff --git a/corelib/src/felt_252.cairo b/corelib/src/felt_252.cairo index f1f9f1e0d3b..2a32a86ac4f 100644 --- a/corelib/src/felt_252.cairo +++ b/corelib/src/felt_252.cairo @@ -5,7 +5,7 @@ pub(crate) impl Felt252Zero of core::num::traits::Zero { #[inline(always)] fn is_zero(self: @felt252) -> bool { - *self == Felt252Zero::zero() + *self == Self::zero() } #[inline(always)] @@ -21,7 +21,7 @@ pub(crate) impl Felt252One of core::num::traits::One { #[inline(always)] fn is_one(self: @felt252) -> bool { - *self == Felt252One::one() + *self == Self::one() } #[inline(always)] diff --git a/corelib/src/integer.cairo b/corelib/src/integer.cairo index 50f54d747f9..1b9f0788814 100644 --- a/corelib/src/integer.cairo +++ b/corelib/src/integer.cairo @@ -2476,7 +2476,7 @@ impl U8Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @u8) -> bool { - *self == U8Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @u8) -> bool { @@ -2490,7 +2490,7 @@ impl U16Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @u16) -> bool { - *self == U16Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @u16) -> bool { @@ -2504,7 +2504,7 @@ impl U32Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @u32) -> bool { - *self == U32Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @u32) -> bool { @@ -2518,7 +2518,7 @@ impl U64Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @u64) -> bool { - *self == U64Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @u64) -> bool { @@ -2532,7 +2532,7 @@ impl U128Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @u128) -> bool { - *self == U128Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @u128) -> bool { @@ -2546,7 +2546,7 @@ impl U256Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @u256) -> bool { - *self == U256Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @u256) -> bool { @@ -2560,7 +2560,7 @@ impl I8Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @i8) -> bool { - *self == I8Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @i8) -> bool { @@ -2574,7 +2574,7 @@ impl I16Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @i16) -> bool { - *self == I16Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @i16) -> bool { @@ -2588,7 +2588,7 @@ impl I32Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @i32) -> bool { - *self == I32Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @i32) -> bool { @@ -2602,7 +2602,7 @@ impl I64Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @i64) -> bool { - *self == I64Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @i64) -> bool { @@ -2616,7 +2616,7 @@ impl I128Zero of core::num::traits::Zero { } #[inline(always)] fn is_zero(self: @i128) -> bool { - *self == I128Zero::zero() + *self == Self::zero() } #[inline(always)] fn is_non_zero(self: @i128) -> bool { @@ -2632,7 +2632,7 @@ impl U8One of core::num::traits::One { } #[inline(always)] fn is_one(self: @u8) -> bool { - *self == U8One::one() + *self == Self::one() } #[inline(always)] fn is_non_one(self: @u8) -> bool { @@ -2646,7 +2646,7 @@ impl U16One of core::num::traits::One { } #[inline(always)] fn is_one(self: @u16) -> bool { - *self == U16One::one() + *self == Self::one() } #[inline(always)] fn is_non_one(self: @u16) -> bool { @@ -2660,7 +2660,7 @@ impl U32One of core::num::traits::One { } #[inline(always)] fn is_one(self: @u32) -> bool { - *self == U32One::one() + *self == Self::one() } #[inline(always)] fn is_non_one(self: @u32) -> bool { @@ -2674,7 +2674,7 @@ impl U64One of core::num::traits::One { } #[inline(always)] fn is_one(self: @u64) -> bool { - *self == U64One::one() + *self == Self::one() } #[inline(always)] fn is_non_one(self: @u64) -> bool { @@ -2688,7 +2688,7 @@ impl U128One of core::num::traits::One { } #[inline(always)] fn is_one(self: @u128) -> bool { - *self == U128One::one() + *self == Self::one() } #[inline(always)] fn is_non_one(self: @u128) -> bool { @@ -2702,7 +2702,7 @@ impl U256One of core::num::traits::One { } #[inline(always)] fn is_one(self: @u256) -> bool { - *self == U256One::one() + *self == Self::one() } #[inline(always)] fn is_non_one(self: @u256) -> bool { @@ -2717,7 +2717,7 @@ impl I8One of core::num::traits::One { #[inline(always)] fn is_one(self: @i8) -> bool { - *self == I8One::one() + *self == Self::one() } #[inline(always)] @@ -2733,7 +2733,7 @@ impl I16One of core::num::traits::One { #[inline(always)] fn is_one(self: @i16) -> bool { - *self == I16One::one() + *self == Self::one() } #[inline(always)] @@ -2749,7 +2749,7 @@ impl I32One of core::num::traits::One { #[inline(always)] fn is_one(self: @i32) -> bool { - *self == I32One::one() + *self == Self::one() } #[inline(always)] @@ -2765,7 +2765,7 @@ impl I64One of core::num::traits::One { #[inline(always)] fn is_one(self: @i64) -> bool { - *self == I64One::one() + *self == Self::one() } #[inline(always)] @@ -2781,7 +2781,7 @@ impl I128One of core::num::traits::One { #[inline(always)] fn is_one(self: @i128) -> bool { - *self == I128One::one() + *self == Self::one() } #[inline(always)] diff --git a/tests/bug_samples/issue3153.cairo b/tests/bug_samples/issue3153.cairo index 1879eb112d1..e21f21ef25d 100644 --- a/tests/bug_samples/issue3153.cairo +++ b/tests/bug_samples/issue3153.cairo @@ -50,11 +50,11 @@ fn unpack_proposal_fields(packed: felt252) -> (felt252, u64) { impl ProposalStore of Store { fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult { - ProposalStore::read_at_offset(address_domain, base, 0) + Self::read_at_offset(address_domain, base, 0) } fn write(address_domain: u32, base: StorageBaseAddress, value: Proposal) -> SyscallResult<()> { - ProposalStore::write_at_offset(address_domain, base, 0, value) + Self::write_at_offset(address_domain, base, 0, value) } fn read_at_offset( address_domain: u32, base: StorageBaseAddress, offset: u8