Add vm to imul signature, fix return type, formatting fixes.

philippeitis · philippeitis · commit 1f9eae69fc18 · 2020-02-27T14:14:37.000-08:00
diff --git a/vm/src/obj/objlist.rs b/vm/src/obj/objlist.rs
@@ -477,7 +477,7 @@ impl PyList {
                 .collect();
             return Ok(vm.ctx.new_list(new_elements));
         }
-        return Err(vm.new_memory_error("".to_owned()));
+        Err(vm.new_memory_error("".to_owned()))
     }
 
     #[pymethod(name = "__rmul__")]
@@ -486,15 +486,15 @@ impl PyList {
     }
 
     #[pymethod(name = "__imul__")]
-    fn imul(zelf: PyRef<Self>, counter: isize) -> PyResult<Self> {
+    fn imul(zelf: PyRef<Self>, counter: isize, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         if counter < 0 || zelf.len() * (counter as usize) < MAX_MEMORY_SIZE {
             let new_elements = sequence::seq_mul(&zelf.borrow_sequence(), counter)
                 .cloned()
                 .collect();
             zelf.elements.replace(new_elements);
-            return Ok(*zelf);
+            return Ok(zelf);
         }
-        return Err(vm.new_memory_error("".to_owned()));
+        Err(vm.new_memory_error("".to_owned()))
     }
 
     #[pymethod]
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -337,7 +337,7 @@ impl PyString {
                     vm.new_overflow_error("cannot fit 'int' into an index-sized integer".to_owned())
                 });
         }
-        return Err(vm.new_memory_error("".to_owned()));
+        Err(vm.new_memory_error("".to_owned()))
     }
 
     #[pymethod(name = "__rmul__")]

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ impl PyList {`
`477`	`477`	`.collect();`
`478`	`478`	`return Ok(vm.ctx.new_list(new_elements));`
`479`	`479`	`}`
`480`		`- return Err(vm.new_memory_error("".to_owned()));`
	`480`	`+ Err(vm.new_memory_error("".to_owned()))`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`#[pymethod(name = "__rmul__")]`
`@@ -486,15 +486,15 @@ impl PyList {`
`486`	`486`	`}`
`487`	`487`
`488`	`488`	`#[pymethod(name = "__imul__")]`
`489`		`- fn imul(zelf: PyRef<Self>, counter: isize) -> PyResult<Self> {`
	`489`	`+ fn imul(zelf: PyRef<Self>, counter: isize, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {`
`490`	`490`	`if counter < 0 \|\| zelf.len() * (counter as usize) < MAX_MEMORY_SIZE {`
`491`	`491`	`let new_elements = sequence::seq_mul(&zelf.borrow_sequence(), counter)`
`492`	`492`	`.cloned()`
`493`	`493`	`.collect();`
`494`	`494`	`zelf.elements.replace(new_elements);`
`495`		`- return Ok(*zelf);`
	`495`	`+ return Ok(zelf);`
`496`	`496`	`}`
`497`		`- return Err(vm.new_memory_error("".to_owned()));`
	`497`	`+ Err(vm.new_memory_error("".to_owned()))`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`#[pymethod]`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ impl PyString {`
`337`	`337`	`vm.new_overflow_error("cannot fit 'int' into an index-sized integer".to_owned())`
`338`	`338`	`});`
`339`	`339`	`}`
`340`		`- return Err(vm.new_memory_error("".to_owned()));`
	`340`	`+ Err(vm.new_memory_error("".to_owned()))`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`#[pymethod(name = "__rmul__")]`