fix formatting issues

dannasman · dannasman · commit 05ce6f88e0f0 · 2022-10-18T14:13:16.000+03:00
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
@@ -18,6 +18,7 @@ mod decl {
         VirtualMachine,
     };
     use crossbeam_utils::atomic::AtomicCell;
+    use num_bigint::BigInt;
     use num_traits::{Signed, ToPrimitive};
     use std::fmt;
 
@@ -42,7 +43,7 @@ mod decl {
             .map(Into::into)
         }
 
-        #[pyclassmethod]
+        #[pyclassmethod]    
         fn from_iterable(
             cls: PyTypeRef,
             source: PyObjectRef,
@@ -64,16 +65,17 @@ mod decl {
         fn reduce(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyTupleRef> {
             let source =  zelf.source.read().clone();
             let active = zelf.active.read().clone();
+            let cls = zelf.class().clone();
             match source {
                 Some(source) => {
                     match active {
                         Some(active) => {
-                            Ok(vm.new_tuple((zelf.class().clone(), vm.ctx.empty_tuple.clone(), (source, active))))
+                            Ok(vm.new_tuple((cls, vm.ctx.empty_tuple.clone(), (source, active))))
                         },
-                        None => Ok(vm.new_tuple((zelf.class().clone(), vm.ctx.empty_tuple.clone(), (source, ))))
+                        None => Ok(vm.new_tuple((cls, vm.ctx.empty_tuple.clone(), (source, ))))
                     }
                 },
-                None => Ok(vm.new_tuple((zelf.class().clone(), vm.ctx.empty_tuple.clone())))
+                None => Ok(vm.new_tuple((cls, vm.ctx.empty_tuple.clone())))
             }
         }
     }
@@ -163,7 +165,7 @@ mod decl {
         #[pymethod(magic)]
         fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyIter, PyIter)) {
             (
-                zelf.class().to_owned(),
+                zelf.class().clone(),
                 (zelf.data.clone(), zelf.selectors.clone()),
             )
         }
@@ -234,7 +236,7 @@ mod decl {
         //      return Py_BuildValue("0(00)", Py_TYPE(lz), lz->long_cnt, lz->long_step);
         #[pymethod(magic)]
         fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef,)) {
-            (zelf.class().to_owned(), (zelf.cur.read().clone(),))
+            (zelf.class().clone(), (zelf.cur.read().clone(),))
         }
 
         #[pymethod(magic)]
@@ -359,7 +361,7 @@ mod decl {
 
         #[pymethod(magic)]
         fn reduce(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyTupleRef> {
-            let cls = zelf.class().to_owned();
+            let cls = zelf.class().clone();
             Ok(match zelf.times {
                 Some(ref times) => vm.new_tuple((cls, (zelf.object.clone(), *times.read()))),
                 None => vm.new_tuple((cls, (zelf.object.clone(),))),
@@ -426,7 +428,7 @@ mod decl {
         #[pymethod(magic)]
         fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter)) {
             (
-                zelf.class().to_owned(),
+                zelf.class().clone(),
                 (zelf.function.clone(), zelf.iterable.clone()),
             )
         }
@@ -487,11 +489,11 @@ mod decl {
     #[pyclass(with(IterNext, Constructor), flags(BASETYPE))]
     impl PyItertoolsTakewhile {
         #[pymethod(magic)]
-        fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), u32) {
+        fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), BigInt) {
             (
-                zelf.class().to_owned(),
+                zelf.class().clone(),
                 (zelf.predicate.clone(), zelf.iterable.clone()),
-                zelf.stop_flag.load() as _,
+                (if zelf.stop_flag.load() { 1 } else { 0 }).into(),
             )
         }
         #[pymethod(magic)]
@@ -568,11 +570,11 @@ mod decl {
     #[pyclass(with(IterNext, Constructor), flags(BASETYPE))]
     impl PyItertoolsDropwhile {
         #[pymethod(magic)]
-        fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), u32) {
+        fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), BigInt) {
             (
-                zelf.class().to_owned(),
+                zelf.class().clone(),
                 (zelf.predicate.clone().into(), zelf.iterable.clone()),
-                (zelf.start_flag.load() as _),
+                (if zelf.start_flag.load() { 1 } else { 0 }).into(),
             )
         }
         #[pymethod(magic)]
@@ -965,7 +967,7 @@ mod decl {
         #[pymethod(magic)]
         fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter)) {
             (
-                zelf.class().to_owned(),
+                zelf.class().clone(),
                 (zelf.predicate.clone(), zelf.iterable.clone()),
             )
         }
@@ -1453,7 +1455,7 @@ mod decl {
                 // Increment the current index which we know is not at its
                 // maximum. Then set all to the right to the same value.
                 for j in idx as usize..r {
-                    indices[j] = index;
+                    indices[j as usize] = index as usize;
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ mod decl {`
`18`	`18`	`VirtualMachine,`
`19`	`19`	`};`
`20`	`20`	`use crossbeam_utils::atomic::AtomicCell;`
	`21`	`+ use num_bigint::BigInt;`
`21`	`22`	`use num_traits::{Signed, ToPrimitive};`
`22`	`23`	`use std::fmt;`
`23`	`24`
`@@ -42,7 +43,7 @@ mod decl {`
`42`	`43`	`.map(Into::into)`
`43`	`44`	`}`
`44`	`45`
`45`		`- #[pyclassmethod]`
	`46`	`+ #[pyclassmethod]`
`46`	`47`	`fn from_iterable(`
`47`	`48`	`cls: PyTypeRef,`
`48`	`49`	`source: PyObjectRef,`
`@@ -64,16 +65,17 @@ mod decl {`
`64`	`65`	`fn reduce(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyTupleRef> {`
`65`	`66`	`let source = zelf.source.read().clone();`
`66`	`67`	`let active = zelf.active.read().clone();`
	`68`	`+ let cls = zelf.class().clone();`
`67`	`69`	`match source {`
`68`	`70`	`Some(source) => {`
`69`	`71`	`match active {`
`70`	`72`	`Some(active) => {`
`71`		`- Ok(vm.new_tuple((zelf.class().clone(), vm.ctx.empty_tuple.clone(), (source, active))))`
	`73`	`+ Ok(vm.new_tuple((cls, vm.ctx.empty_tuple.clone(), (source, active))))`
`72`	`74`	`},`
`73`		`- None => Ok(vm.new_tuple((zelf.class().clone(), vm.ctx.empty_tuple.clone(), (source, ))))`
	`75`	`+ None => Ok(vm.new_tuple((cls, vm.ctx.empty_tuple.clone(), (source, ))))`
`74`	`76`	`}`
`75`	`77`	`},`
`76`		`- None => Ok(vm.new_tuple((zelf.class().clone(), vm.ctx.empty_tuple.clone())))`
	`78`	`+ None => Ok(vm.new_tuple((cls, vm.ctx.empty_tuple.clone())))`
`77`	`79`	`}`
`78`	`80`	`}`
`79`	`81`	`}`
`@@ -163,7 +165,7 @@ mod decl {`
`163`	`165`	`#[pymethod(magic)]`
`164`	`166`	`fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyIter, PyIter)) {`
`165`	`167`	`(`
`166`		`- zelf.class().to_owned(),`
	`168`	`+ zelf.class().clone(),`
`167`	`169`	`(zelf.data.clone(), zelf.selectors.clone()),`
`168`	`170`	`)`
`169`	`171`	`}`
`@@ -234,7 +236,7 @@ mod decl {`
`234`	`236`	`// return Py_BuildValue("0(00)", Py_TYPE(lz), lz->long_cnt, lz->long_step);`
`235`	`237`	`#[pymethod(magic)]`
`236`	`238`	`fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef,)) {`
`237`		`- (zelf.class().to_owned(), (zelf.cur.read().clone(),))`
	`239`	`+ (zelf.class().clone(), (zelf.cur.read().clone(),))`
`238`	`240`	`}`
`239`	`241`
`240`	`242`	`#[pymethod(magic)]`
`@@ -359,7 +361,7 @@ mod decl {`
`359`	`361`
`360`	`362`	`#[pymethod(magic)]`
`361`	`363`	`fn reduce(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyTupleRef> {`
`362`		`- let cls = zelf.class().to_owned();`
	`364`	`+ let cls = zelf.class().clone();`
`363`	`365`	`Ok(match zelf.times {`
`364`	`366`	`Some(ref times) => vm.new_tuple((cls, (zelf.object.clone(), *times.read()))),`
`365`	`367`	`None => vm.new_tuple((cls, (zelf.object.clone(),))),`
`@@ -426,7 +428,7 @@ mod decl {`
`426`	`428`	`#[pymethod(magic)]`
`427`	`429`	`fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter)) {`
`428`	`430`	`(`
`429`		`- zelf.class().to_owned(),`
	`431`	`+ zelf.class().clone(),`
`430`	`432`	`(zelf.function.clone(), zelf.iterable.clone()),`
`431`	`433`	`)`
`432`	`434`	`}`
`@@ -487,11 +489,11 @@ mod decl {`
`487`	`489`	`#[pyclass(with(IterNext, Constructor), flags(BASETYPE))]`
`488`	`490`	`impl PyItertoolsTakewhile {`
`489`	`491`	`#[pymethod(magic)]`
`490`		`- fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), u32) {`
	`492`	`+ fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), BigInt) {`
`491`	`493`	`(`
`492`		`- zelf.class().to_owned(),`
	`494`	`+ zelf.class().clone(),`
`493`	`495`	`(zelf.predicate.clone(), zelf.iterable.clone()),`
`494`		`- zelf.stop_flag.load() as _,`
	`496`	`+ (if zelf.stop_flag.load() { 1 } else { 0 }).into(),`
`495`	`497`	`)`
`496`	`498`	`}`
`497`	`499`	`#[pymethod(magic)]`
`@@ -568,11 +570,11 @@ mod decl {`
`568`	`570`	`#[pyclass(with(IterNext, Constructor), flags(BASETYPE))]`
`569`	`571`	`impl PyItertoolsDropwhile {`
`570`	`572`	`#[pymethod(magic)]`
`571`		`- fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), u32) {`
	`573`	`+ fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter), BigInt) {`
`572`	`574`	`(`
`573`		`- zelf.class().to_owned(),`
	`575`	`+ zelf.class().clone(),`
`574`	`576`	`(zelf.predicate.clone().into(), zelf.iterable.clone()),`
`575`		`- (zelf.start_flag.load() as _),`
	`577`	`+ (if zelf.start_flag.load() { 1 } else { 0 }).into(),`
`576`	`578`	`)`
`577`	`579`	`}`
`578`	`580`	`#[pymethod(magic)]`
`@@ -965,7 +967,7 @@ mod decl {`
`965`	`967`	`#[pymethod(magic)]`
`966`	`968`	`fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyObjectRef, PyIter)) {`
`967`	`969`	`(`
`968`		`- zelf.class().to_owned(),`
	`970`	`+ zelf.class().clone(),`
`969`	`971`	`(zelf.predicate.clone(), zelf.iterable.clone()),`
`970`	`972`	`)`
`971`	`973`	`}`
`@@ -1453,7 +1455,7 @@ mod decl {`
`1453`	`1455`	`// Increment the current index which we know is not at its`
`1454`	`1456`	`// maximum. Then set all to the right to the same value.`
`1455`	`1457`	`for j in idx as usize..r {`
`1456`		`- indices[j] = index;`
	`1458`	`+ indices[j as usize] = index as usize;`
`1457`	`1459`	`}`
`1458`	`1460`	`}`
`1459`	`1461`