rename

qingshi163 · qingshi163 · commit 06a0d1c118cc · 2022-05-29T19:08:02.000+02:00
diff --git a/vm/src/builtins/float.rs b/vm/src/builtins/float.rs
@@ -536,17 +536,17 @@ impl Hashable for PyFloat {
 
 impl AsNumber for PyFloat {
     const AS_NUMBER: PyNumberMethods = PyNumberMethods {
-        add: Some(|number, other, vm| Self::np_float_op(number, other, |a, b| a + b, vm)),
-        subtract: Some(|number, other, vm| Self::np_float_op(number, other, |a, b| a - b, vm)),
-        multiply: Some(|number, other, vm| Self::np_float_op(number, other, |a, b| a * b, vm)),
-        remainder: Some(|number, other, vm| Self::np_general_op(number, other, inner_mod, vm)),
-        divmod: Some(|number, other, vm| Self::np_general_op(number, other, inner_divmod, vm)),
-        power: Some(|number, other, vm| Self::np_general_op(number, other, float_pow, vm)),
+        add: Some(|number, other, vm| Self::number_float_op(number, other, |a, b| a + b, vm)),
+        subtract: Some(|number, other, vm| Self::number_float_op(number, other, |a, b| a - b, vm)),
+        multiply: Some(|number, other, vm| Self::number_float_op(number, other, |a, b| a * b, vm)),
+        remainder: Some(|number, other, vm| Self::number_general_op(number, other, inner_mod, vm)),
+        divmod: Some(|number, other, vm| Self::number_general_op(number, other, inner_divmod, vm)),
+        power: Some(|number, other, vm| Self::number_general_op(number, other, float_pow, vm)),
         negative: Some(|number, vm| {
             let value = Self::number_downcast(number).value;
             (-value).to_pyresult(vm)
         }),
-        positive: Some(|number, vm| Self::np_float(number, vm).to_pyresult(vm)),
+        positive: Some(|number, vm| Self::number_float(number, vm).to_pyresult(vm)),
         absolute: Some(|number, vm| {
             let value = Self::number_downcast(number).value;
             value.abs().to_pyresult(vm)
@@ -556,17 +556,19 @@ impl AsNumber for PyFloat {
             let value = Self::number_downcast(number).value;
             try_to_bigint(value, vm).map(|x| vm.ctx.new_int(x))
         }),
-        float: Some(|number, vm| Ok(Self::np_float(number, vm))),
+        float: Some(|number, vm| Ok(Self::number_float(number, vm))),
         floor_divide: Some(|number, other, vm| {
-            Self::np_general_op(number, other, inner_floordiv, vm)
+            Self::number_general_op(number, other, inner_floordiv, vm)
+        }),
+        true_divide: Some(|number, other, vm| {
+            Self::number_general_op(number, other, inner_div, vm)
         }),
-        true_divide: Some(|number, other, vm| Self::np_general_op(number, other, inner_div, vm)),
         ..PyNumberMethods::NOT_IMPLEMENTED
     };
 }
 
 impl PyFloat {
-    fn np_general_op<F, R>(
+    fn number_general_op<F, R>(
         number: &PyNumber,
         other: &PyObject,
         op: F,
@@ -583,14 +585,19 @@ impl PyFloat {
         }
     }
 
-    fn np_float_op<F>(number: &PyNumber, other: &PyObject, op: F, vm: &VirtualMachine) -> PyResult
+    fn number_float_op<F>(
+        number: &PyNumber,
+        other: &PyObject,
+        op: F,
+        vm: &VirtualMachine,
+    ) -> PyResult
     where
         F: FnOnce(f64, f64) -> f64,
     {
-        Self::np_general_op(number, other, |a, b, _vm| op(a, b), vm)
+        Self::number_general_op(number, other, |a, b, _vm| op(a, b), vm)
     }
 
-    fn np_float(number: &PyNumber, vm: &VirtualMachine) -> PyRef<PyFloat> {
+    fn number_float(number: &PyNumber, vm: &VirtualMachine) -> PyRef<PyFloat> {
         if let Some(zelf) = number.obj.downcast_ref_if_exact::<Self>(vm) {
             zelf.to_owned()
         } else {
