rebase reordering

corelib/src/ops.cairo

@@ -56,18 +56,18 @@ 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;
-
-mod range;
-pub use range::{Range, RangeInclusive, RangeInclusiveIterator, RangeIterator, RangeTrait};
-// `RangeOp` and `RangeInclusiveOp` are used internally by the compiler.
-#[allow(unused_imports)]
-use range::{RangeInclusiveOp, RangeOp};
 
 mod function;
 pub use function::{Fn, FnOnce};
 
 pub mod index;
 pub use index::{Index, IndexView};
+
+mod range;
+// `RangeOp` and `RangeInclusiveOp` are used internally by the compiler.
+#[allow(unused_imports)]
+use range::{RangeInclusiveOp, RangeOp};
+pub use range::{Range, RangeInclusive, RangeInclusiveIterator, RangeIterator, RangeTrait};

corelib/src/ops/range.cairo

@@ -172,8 +172,12 @@ pub impl RangeInclusiveOpImpl<T> of RangeInclusiveOp<T> {
     }
 }
 
-impl RangeInclusiveDebug<T, impl TDebug: crate::fmt::Debug<T>> of crate::fmt::Debug<RangeInclusive<T>> {
-    fn fmt(self: @RangeInclusive<T>, ref f: crate::fmt::Formatter) -> Result<(), crate::fmt::Error> {
+impl RangeInclusiveDebug<
+    T, impl TDebug: crate::fmt::Debug<T>,
+> of crate::fmt::Debug<RangeInclusive<T>> {
+    fn fmt(
+        self: @RangeInclusive<T>, ref f: crate::fmt::Formatter,
+    ) -> Result<(), crate::fmt::Error> {
         self.start.fmt(ref f)?;
         write!(f, "..=")?;
         self.end.fmt(ref f)?;
@@ -206,13 +210,7 @@ impl RangeInclusiveIteratorImpl<
 }
 
 pub impl RangeInclusiveIntoIterator<
-    T,
-    +One<T>,
-    +Add<T>,
-    +Copy<T>,
-    +Drop<T>,
-    +PartialEq<T>,
-    +PartialOrd<T>,
+    T, +One<T>, +Add<T>, +Copy<T>, +Drop<T>, +PartialEq<T>, +PartialOrd<T>,
 > of IntoIterator<RangeInclusive<T>> {
     type IntoIter = RangeInclusiveIterator<T>;