Remove PyFloatRef

Author: youknowone

stdlib/src/math.rs

@@ -3,10 +3,10 @@ pub(crate) use math::make_module;
 #[pymodule]
 mod math {
     use crate::vm::{
-        builtins::{try_bigint_to_f64, try_f64_to_bigint, PyFloatRef, PyInt, PyIntRef},
+        builtins::{try_bigint_to_f64, try_f64_to_bigint, PyFloat, PyInt, PyIntRef},
         function::{ArgIntoFloat, ArgIterable, OptionalArg, PosArgs},
         utils::Either,
-        PyObjectRef, PyResult, PySequence, TypeProtocol, VirtualMachine,
+        PyObjectRef, PyRef, PyResult, PySequence, TypeProtocol, VirtualMachine,
     };
     use num_bigint::BigInt;
     use num_traits::{One, Signed, Zero};
@@ -460,7 +460,11 @@ mod math {
     }
 
     #[pyfunction]
-    fn ldexp(x: Either<PyFloatRef, PyIntRef>, i: PyIntRef, vm: &VirtualMachine) -> PyResult<f64> {
+    fn ldexp(
+        x: Either<PyRef<PyFloat>, PyIntRef>,
+        i: PyIntRef,
+        vm: &VirtualMachine,
+    ) -> PyResult<f64> {
         let value = match x {
             Either::A(f) => f.to_f64(),
             Either::B(z) => try_bigint_to_f64(z.as_bigint(), vm)?,

vm/src/builtins/float.rs

@@ -94,7 +94,7 @@ macro_rules! impl_try_from_object_float {
     ($($t:ty),*) => {
         $(impl TryFromObject for $t {
             fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
-                PyFloatRef::try_from_object(vm, obj).map(|f| f.to_f64() as $t)
+                PyRef::<PyFloat>::try_from_object(vm, obj).map(|f| f.to_f64() as $t)
             }
         })*
     };
@@ -539,8 +539,6 @@ impl Hashable for PyFloat {
     }
 }
 
-pub type PyFloatRef = PyRef<PyFloat>;
-
 // Retrieve inner float value:
 pub(crate) fn get_value(obj: &PyObjectRef) -> f64 {
     obj.payload::<PyFloat>().unwrap().value

vm/src/builtins/mod.rs

@@ -22,7 +22,7 @@ pub use enumerate::PyEnumerate;
 pub(crate) mod filter;
 pub use filter::PyFilter;
 pub(crate) mod float;
-pub use float::{PyFloat, PyFloatRef};
+pub use float::PyFloat;
 pub(crate) mod frame;
 pub(crate) mod function;
 pub use function::{PyBoundMethod, PyFunction};

wasm/lib/src/js_module.rs

@@ -5,7 +5,7 @@ use crate::{
 };
 use js_sys::{Array, Object, Promise, Reflect};
 use rustpython_vm::{
-    builtins::{PyBaseExceptionRef, PyFloatRef, PyStrRef, PyType, PyTypeRef},
+    builtins::{PyBaseExceptionRef, PyFloat, PyStrRef, PyType, PyTypeRef},
     function::{ArgCallable, IntoPyObject, OptionalArg, OptionalOption, PosArgs},
     protocol::PyIterReturn,
     types::{IterNext, IterNextIterable},
@@ -110,7 +110,7 @@ impl PyJsValue {
     }
 
     #[pymethod]
-    fn new_from_float(&self, n: PyFloatRef) -> PyJsValue {
+    fn new_from_float(&self, n: PyRef<PyFloat>) -> PyJsValue {
         PyJsValue::new(n.to_f64())
     }