Fixed issue with sort instability of use statements. (#7440)

Author: orizi

corelib/src/array.cairo

@@ -61,15 +61,15 @@
 //!
 //! [`append`]: ArrayTrait::append
 
-use crate::box::BoxTrait;
-use crate::iter::Iterator;
-use crate::metaprogramming::TypeEqual;
-use crate::serde::Serde;
 use crate::RangeCheck;
+use crate::box::BoxTrait;
 #[allow(unused_imports)]
 use crate::gas::withdraw_gas;
+use crate::iter::Iterator;
+use crate::metaprogramming::TypeEqual;
 #[allow(unused_imports)]
 use crate::option::OptionTrait;
+use crate::serde::Serde;
 #[feature("deprecated-index-traits")]
 use crate::traits::IndexView;
 /// A collection of elements of the same type contiguous in memory.

corelib/src/byte_array.cairo

@@ -43,18 +43,18 @@
 //! ```
 
 use crate::array::{ArrayTrait, SpanTrait};
-use crate::clone::Clone;
-use crate::cmp::min;
-use crate::traits::{Into, TryInto};
 #[allow(unused_imports)]
 use crate::bytes_31::{
     BYTES_IN_BYTES31, Bytes31Trait, POW_2_128, POW_2_8, U128IntoBytes31, U8IntoBytes31,
     one_shift_left_bytes_felt252, one_shift_left_bytes_u128, split_u128, u8_at_u256,
 };
+use crate::clone::Clone;
+use crate::cmp::min;
 #[allow(unused_imports)]
 use crate::integer::{U32TryIntoNonZero, u128_safe_divmod};
 #[allow(unused_imports)]
 use crate::serde::Serde;
+use crate::traits::{Into, TryInto};
 #[allow(unused_imports)]
 use crate::zeroable::NonZeroIntoImpl;
 

corelib/src/bytes_31.cairo

@@ -14,12 +14,12 @@
 //! assert!(value[0] == 0xbb);
 //! ```
 
-use crate::traits::{Into, TryInto};
 use crate::RangeCheck;
 #[allow(unused_imports)]
 use crate::integer::{u128_safe_divmod, u128_to_felt252};
 #[allow(unused_imports)]
 use crate::option::OptionTrait;
+use crate::traits::{Into, TryInto};
 
 pub(crate) const BYTES_IN_BYTES31: usize = 31;
 const BYTES_IN_U128: usize = 16;

corelib/src/circuit.cairo

@@ -764,8 +764,8 @@ extern fn get_circuit_output<C, Output>(
 /// Helper module to convert into `u384`.
 mod conversions {
     use crate::integer::{downcast, upcast};
-    use crate::internal::bounded_int::{AddHelper, BoundedInt, DivRemHelper, MulHelper, UnitInt};
     use crate::internal::bounded_int;
+    use crate::internal::bounded_int::{AddHelper, BoundedInt, DivRemHelper, MulHelper, UnitInt};
     use super::{u384, u96};
 
     const POW128: felt252 = 0x100000000000000000000000000000000;

corelib/src/ec.cairo

@@ -51,12 +51,12 @@
 //! let _result = state.finalize();
 //! ```
 
-use crate::zeroable::IsZeroResult;
 use crate::RangeCheck;
 #[allow(unused_imports)]
 use crate::array::ArrayTrait;
 #[allow(unused_imports)]
 use crate::traits::{Into, TryInto};
+use crate::zeroable::IsZeroResult;
 
 pub mod stark_curve {
     /// The STARK Curve is defined by the equation y² ≡ x³ + α·x + β (mod p).

corelib/src/ecdsa.cairo

@@ -14,13 +14,13 @@
 //! * y = 0x5668060aa49730b7be4801df46ec62de53ecd11abe43a32873000c36e8dc1f
 
 use crate::ec::{EcPoint, EcPointTrait, EcStateTrait};
-use crate::{ec, math};
 #[allow(unused_imports)]
 use crate::option::OptionTrait;
 #[allow(unused_imports)]
 use crate::traits::{Into, TryInto};
 #[allow(unused_imports)]
 use crate::zeroable::IsZeroResult;
+use crate::{ec, math};
 
 /// Verifies an ECDSA signature against a message hash and public key.
 ///

corelib/src/integer.cairo

@@ -65,14 +65,14 @@
 //! * [`TryInto`] for potentially fallible conversions
 //! * [`Into`] for infallible conversions to wider types
 
+use crate::RangeCheck;
 #[allow(unused_imports)]
 use crate::array::{ArrayTrait, SpanTrait};
-#[allow(unused_imports)]
-use crate::zeroable::{IsZeroResult, NonZeroIntoImpl, Zeroable};
 use crate::option::OptionTrait;
 use crate::result::ResultTrait;
 use crate::traits::{BitAnd, BitNot, BitOr, BitXor, Default, Felt252DictValue, Into, TryInto};
-use crate::RangeCheck;
+#[allow(unused_imports)]
+use crate::zeroable::{IsZeroResult, NonZeroIntoImpl, Zeroable};
 
 // TODO(spapini): Add method for const creation from Integer.
 pub trait NumericLiteral<T>;

corelib/src/internal/bounded_int.cairo

@@ -1,5 +1,5 @@
-use crate::integer::{downcast, upcast};
 use crate::RangeCheck;
+use crate::integer::{downcast, upcast};
 
 pub(crate) extern type BoundedInt<const MIN: felt252, const MAX: felt252>;
 

corelib/src/math.cairo

@@ -2,8 +2,8 @@
 //!
 //! Provides extended GCD, modular inverse, and modular arithmetic operations.
 
-use crate::integer::{U128MulGuarantee, u256_wide_mul, u512_safe_div_rem_by_u256};
 use crate::RangeCheck;
+use crate::integer::{U128MulGuarantee, u256_wide_mul, u512_safe_div_rem_by_u256};
 #[allow(unused_imports)]
 use crate::option::OptionTrait;
 #[allow(unused_imports)]

corelib/src/prelude/v2023_01.cairo

@@ -2,7 +2,6 @@ pub use starknet::storage::{
     StorageMapReadAccess, StorageMapWriteAccess, StoragePointerReadAccess,
     StoragePointerWriteAccess,
 };
-pub use crate::ops::Deref;
 use crate::array::{Array, ArrayTrait, Span, SpanTrait, ToSpanTrait};
 use crate::box::{Box, BoxTrait};
 use crate::byte_array::{ByteArray, ByteArrayIndexView, ByteArrayStringLiteral, ByteArrayTrait};
@@ -23,7 +22,12 @@ use crate::integer::{
     U64IntoFelt252, U8IntoFelt252, i128, i16, i32, i64, i8, u128, u128_is_zero, u16, u256, u32, u64,
     u8,
 };
+#[feature("corelib-internal-use")]
+#[deprecated(feature: "corelib-internal-use", note: "Use `core::num::traits::Sqrt` instead")]
+use crate::integer::{u128_sqrt, u256_sqrt};
+use crate::iter::{FromIterator, IntoIterator, Iterator};
 use crate::nullable::{Nullable, NullableTrait, match_nullable, null, nullable_from_box};
+pub use crate::ops::Deref;
 use crate::option::Option::{None, Some};
 use crate::option::{Option, OptionTrait};
 use crate::panics::{Panic, PanicResult, panic};
@@ -32,32 +36,11 @@ use crate::poseidon::Poseidon;
 use crate::result::Result::{Err, Ok};
 use crate::result::{Result, ResultTrait};
 use crate::serde::Serde;
-use crate::string::StringLiteral;
-use crate::traits::{
-    Add, BitAnd, BitNot, BitOr, BitXor, Copy, Default, Destruct, Div, DivRem, Drop,
-    Felt252DictValue, Into, Mul, Neg, Not, PanicDestruct, PartialEq, PartialOrd, Rem, Sub, TryInto,
-    TupleSize0Copy, TupleSize0Drop,
-};
-use crate::iter::{FromIterator, IntoIterator, Iterator};
-use crate::zeroable::{NonZero, Zeroable};
-use crate::{
-    BoolBitAnd, BoolBitOr, BoolBitXor, BoolFelt252DictValue, BoolIntoFelt252, BoolNot,
-    BoolPartialEq, BoolSerde, Felt252Add, Felt252AddEq, Felt252Default, Felt252Felt252DictValue,
-    Felt252Mul, Felt252MulEq, Felt252Neg, Felt252PartialEq, Felt252Serde, Felt252Sub, Felt252SubEq,
-    Felt252TryIntoNonZero, RangeCheck, SegmentArena, array, assert, bool, bool_and_impl,
-    bool_not_impl, bool_or_impl, bool_to_felt252, bool_xor_impl, box, byte_array, bytes_31, clone,
-    cmp, debug, dict, drop, dup, ec, ecdsa, felt252, felt252_add, felt252_const, felt252_div,
-    felt252_is_zero, felt252_mul, felt252_sub, gas, hash, integer, internal, keccak, math, never,
-    nullable, option, panic_with_felt252, panics, pedersen, poseidon, result, serde, string,
-    testing, to_byte_array, traits, usize, zeroable,
-};
-#[feature("corelib-internal-use")]
-use crate::starknet::System;
 #[feature("corelib-internal-use")]
 use crate::starknet;
 #[feature("corelib-internal-use")]
-#[deprecated(feature: "corelib-internal-use", note: "Use `core::num::traits::Sqrt` instead")]
-use crate::integer::{u128_sqrt, u256_sqrt};
+use crate::starknet::System;
+use crate::string::StringLiteral;
 #[cfg(test)]
 use crate::test;
 #[deprecated(
@@ -85,5 +68,22 @@ pub use crate::traits::RemEq;
 )]
 #[feature("deprecated-op-assign-traits")]
 pub use crate::traits::SubEq;
+use crate::traits::{
+    Add, BitAnd, BitNot, BitOr, BitXor, Copy, Default, Destruct, Div, DivRem, Drop,
+    Felt252DictValue, Into, Mul, Neg, Not, PanicDestruct, PartialEq, PartialOrd, Rem, Sub, TryInto,
+    TupleSize0Copy, TupleSize0Drop,
+};
 #[feature("deprecated-index-traits")]
 use crate::traits::{Index, IndexView};
+use crate::zeroable::{NonZero, Zeroable};
+use crate::{
+    BoolBitAnd, BoolBitOr, BoolBitXor, BoolFelt252DictValue, BoolIntoFelt252, BoolNot,
+    BoolPartialEq, BoolSerde, Felt252Add, Felt252AddEq, Felt252Default, Felt252Felt252DictValue,
+    Felt252Mul, Felt252MulEq, Felt252Neg, Felt252PartialEq, Felt252Serde, Felt252Sub, Felt252SubEq,
+    Felt252TryIntoNonZero, RangeCheck, SegmentArena, array, assert, bool, bool_and_impl,
+    bool_not_impl, bool_or_impl, bool_to_felt252, bool_xor_impl, box, byte_array, bytes_31, clone,
+    cmp, debug, dict, drop, dup, ec, ecdsa, felt252, felt252_add, felt252_const, felt252_div,
+    felt252_is_zero, felt252_mul, felt252_sub, gas, hash, integer, internal, keccak, math, never,
+    nullable, option, panic_with_felt252, panics, pedersen, poseidon, result, serde, string,
+    testing, to_byte_array, traits, usize, zeroable,
+};