Merge pull request RustPython#676 from adrian17/master

OddCoincidence · web-flow · commit 36204f29fe4d · 2019-03-13T18:54:36.000-07:00
Use Into&lt;BigInt&gt; instead of ToBigInt to avoid copies
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -24,11 +24,14 @@ pub struct PyInt {
 pub type PyIntRef = PyRef<PyInt>;
 
 impl PyInt {
-    pub fn new<T: ToBigInt>(i: T) -> Self {
-        PyInt {
-            // TODO: this .clone()s a BigInt, which is not what we want.
-            value: i.to_bigint().unwrap(),
-        }
+    pub fn new<T: Into<BigInt>>(i: T) -> Self {
+        PyInt { value: i.into() }
+    }
+}
+
+impl IntoPyObject for BigInt {
+    fn into_pyobject(self, ctx: &PyContext) -> PyResult {
+        Ok(ctx.new_int(self))
     }
 }
 
@@ -315,8 +318,8 @@ impl PyIntRef {
         }
     }
 
-    fn neg(self, vm: &mut VirtualMachine) -> PyObjectRef {
-        vm.ctx.new_int(-(&self.value))
+    fn neg(self, _vm: &mut VirtualMachine) -> BigInt {
+        -(&self.value)
     }
 
     fn hash(self, _vm: &mut VirtualMachine) -> u64 {
@@ -325,8 +328,8 @@ impl PyIntRef {
         hasher.finish()
     }
 
-    fn abs(self, vm: &mut VirtualMachine) -> PyObjectRef {
-        vm.ctx.new_int(self.value.abs())
+    fn abs(self, _vm: &mut VirtualMachine) -> BigInt {
+        self.value.abs()
     }
 
     fn round(self, _precision: OptionalArg<PyObjectRef>, _vm: &mut VirtualMachine) -> Self {
@@ -337,8 +340,8 @@ impl PyIntRef {
         self.value.to_f64().unwrap()
     }
 
-    fn invert(self, vm: &mut VirtualMachine) -> PyObjectRef {
-        vm.ctx.new_int(!(&self.value))
+    fn invert(self, _vm: &mut VirtualMachine) -> BigInt {
+        !(&self.value)
     }
 
     fn repr(self, _vm: &mut VirtualMachine) -> String {
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -10,7 +10,6 @@ use std::ptr;
 use std::rc::Rc;
 
 use num_bigint::BigInt;
-use num_bigint::ToBigInt;
 use num_complex::Complex64;
 use num_traits::{One, Zero};
 
@@ -508,7 +507,7 @@ impl PyContext {
         self.new_instance(self.object(), None)
     }
 
-    pub fn new_int<T: ToBigInt>(&self, i: T) -> PyObjectRef {
+    pub fn new_int<T: Into<BigInt>>(&self, i: T) -> PyObjectRef {
         PyObject::new(PyInt::new(i), self.int_type())
     }
 
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -32,7 +32,7 @@ use crate::pyobject::{
 };
 use crate::stdlib;
 use crate::sysmodule;
-use num_bigint::ToBigInt;
+use num_bigint::BigInt;
 
 // use objects::objects;
 
@@ -109,7 +109,7 @@ impl VirtualMachine {
     }
 
     /// Create a new python int object.
-    pub fn new_int<T: ToBigInt>(&self, i: T) -> PyObjectRef {
+    pub fn new_int<T: Into<BigInt>>(&self, i: T) -> PyObjectRef {
         self.ctx.new_int(i)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,14 @@ pub struct PyInt {`
`24`	`24`	`pub type PyIntRef = PyRef<PyInt>;`
`25`	`25`
`26`	`26`	`impl PyInt {`
`27`		`- pub fn new<T: ToBigInt>(i: T) -> Self {`
`28`		`- PyInt {`
`29`		`- // TODO: this .clone()s a BigInt, which is not what we want.`
`30`		`- value: i.to_bigint().unwrap(),`
`31`		`- }`
	`27`	`+ pub fn new<T: Into<BigInt>>(i: T) -> Self {`
	`28`	`+ PyInt { value: i.into() }`
	`29`	`+ }`
	`30`	`+}`
	`31`	`+`
	`32`	`+impl IntoPyObject for BigInt {`
	`33`	`+ fn into_pyobject(self, ctx: &PyContext) -> PyResult {`
	`34`	`+ Ok(ctx.new_int(self))`
`32`	`35`	`}`
`33`	`36`	`}`
`34`	`37`
`@@ -315,8 +318,8 @@ impl PyIntRef {`
`315`	`318`	`}`
`316`	`319`	`}`
`317`	`320`
`318`		`- fn neg(self, vm: &mut VirtualMachine) -> PyObjectRef {`
`319`		`- vm.ctx.new_int(-(&self.value))`
	`321`	`+ fn neg(self, _vm: &mut VirtualMachine) -> BigInt {`
	`322`	`+ -(&self.value)`
`320`	`323`	`}`
`321`	`324`
`322`	`325`	`fn hash(self, _vm: &mut VirtualMachine) -> u64 {`
`@@ -325,8 +328,8 @@ impl PyIntRef {`
`325`	`328`	`hasher.finish()`
`326`	`329`	`}`
`327`	`330`
`328`		`- fn abs(self, vm: &mut VirtualMachine) -> PyObjectRef {`
`329`		`- vm.ctx.new_int(self.value.abs())`
	`331`	`+ fn abs(self, _vm: &mut VirtualMachine) -> BigInt {`
	`332`	`+ self.value.abs()`
`330`	`333`	`}`
`331`	`334`
`332`	`335`	`fn round(self, _precision: OptionalArg<PyObjectRef>, _vm: &mut VirtualMachine) -> Self {`
`@@ -337,8 +340,8 @@ impl PyIntRef {`
`337`	`340`	`self.value.to_f64().unwrap()`
`338`	`341`	`}`
`339`	`342`
`340`		`- fn invert(self, vm: &mut VirtualMachine) -> PyObjectRef {`
`341`		`- vm.ctx.new_int(!(&self.value))`
	`343`	`+ fn invert(self, _vm: &mut VirtualMachine) -> BigInt {`
	`344`	`+ !(&self.value)`
`342`	`345`	`}`
`343`	`346`
`344`	`347`	`fn repr(self, _vm: &mut VirtualMachine) -> String {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ use std::ptr;`
`10`	`10`	`use std::rc::Rc;`
`11`	`11`
`12`	`12`	`use num_bigint::BigInt;`
`13`		`-use num_bigint::ToBigInt;`
`14`	`13`	`use num_complex::Complex64;`
`15`	`14`	`use num_traits::{One, Zero};`
`16`	`15`
`@@ -508,7 +507,7 @@ impl PyContext {`
`508`	`507`	`self.new_instance(self.object(), None)`
`509`	`508`	`}`
`510`	`509`
`511`		`- pub fn new_int<T: ToBigInt>(&self, i: T) -> PyObjectRef {`
	`510`	`+ pub fn new_int<T: Into<BigInt>>(&self, i: T) -> PyObjectRef {`
`512`	`511`	`PyObject::new(PyInt::new(i), self.int_type())`
`513`	`512`	`}`
`514`	`513`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ use crate::pyobject::{`
`32`	`32`	`};`
`33`	`33`	`use crate::stdlib;`
`34`	`34`	`use crate::sysmodule;`
`35`		`-use num_bigint::ToBigInt;`
	`35`	`+use num_bigint::BigInt;`
`36`	`36`
`37`	`37`	`// use objects::objects;`
`38`	`38`
`@@ -109,7 +109,7 @@ impl VirtualMachine {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`/// Create a new python int object.`
`112`		`- pub fn new_int<T: ToBigInt>(&self, i: T) -> PyObjectRef {`
	`112`	`+ pub fn new_int<T: Into<BigInt>>(&self, i: T) -> PyObjectRef {`
`113`	`113`	`self.ctx.new_int(i)`
`114`	`114`	`}`
`115`	`115`