Merge pull request RustPython#2379 from RustPython/coolreader18/rework-pystruct

Rework pystruct, again

Author: youknowone

Cargo.lock

@@ -723,8 +723,6 @@ def test_module_func(self):
         self.assertRaises(StopIteration, next, it)
         self.assertRaises(StopIteration, next, it)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_half_float(self):
         # Little-endian examples from:
         # http://en.wikipedia.org/wiki/Half_precision_floating-point_format

Lib/test/test_struct.py

@@ -18,6 +18,6 @@ hexf-parse = "0.1.0"
 cfg-if = "0.1"
 once_cell = "1.4.1"
 siphasher = "0.3"
-rand = "0.7.3"
+rand = "0.8"
 derive_more = "0.99.9"
 volatile = "0.3"

common/Cargo.toml

@@ -34,10 +34,10 @@ num-traits = "0.2.8"
 num-integer = "0.1.41"
 num-rational = "0.3"
 num-iter = "0.1.39"
-rand = { version = "0.7", features = ["wasm-bindgen"] }
-rand_core = "0.5"
-getrandom = { version = "0.1", features = ["wasm-bindgen"] }
-mt19937 = "1.0"
+rand = "0.8"
+rand_core = "0.6"
+getrandom = { version = "0.2", features = ["js"] }
+mt19937 = "2.0"
 log = "0.4"
 rustpython-derive = { path = "../derive", version = "0.1.2" }
 rustpython-parser = { path = "../parser", optional = true, version = "0.1.2" }
@@ -47,10 +47,9 @@ rustpython-jit = { path = "../jit", optional = true, version = "0.1.2" }
 rustpython-pylib = { path = "pylib-crate", optional = true, version = "0.1.0" }
 serde = { version = "1.0.66", features = ["derive"] }
 serde_json = "1.0"
-byteorder = "1.2.6"
 regex = "1"
 rustc_version_runtime = "0.1.*"
-statrs = "0.12.0"
+puruspe = "0.1"
 caseless = "0.2.1"
 chrono = { version = "0.4", features = ["wasmbind"] }
 lexical-core = "0.7"
@@ -79,6 +78,7 @@ timsort = "0.1"
 thiserror = "1.0"
 atty = "0.2"
 static_assertions = "1.1"
+half = "1.6"
 
 ## unicode stuff
 unicode_names2 = "0.4"

vm/Cargo.toml

@@ -435,7 +435,7 @@ fn try_complex(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<Option<(Compl
     if let Some(complex) = obj.payload_if_subclass::<PyComplex>(vm) {
         return Ok(Some((complex.value, true)));
     }
-    if let Some(float) = float::try_float(obj, vm)? {
+    if let Some(float) = float::try_float_opt(obj, vm)? {
         return Ok(Some((Complex64::new(float, 0.0), false)));
     }
     Ok(None)

vm/src/builtins/complex.rs

@@ -55,7 +55,7 @@ impl From<f64> for PyFloat {
     }
 }
 
-pub(crate) fn try_float(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<Option<f64>> {
+pub fn try_float_opt(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<Option<f64>> {
     if let Some(float) = obj.payload_if_exact::<PyFloat>(vm) {
         return Ok(Some(float.value));
     }
@@ -76,6 +76,11 @@ pub(crate) fn try_float(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<Opti
     Ok(None)
 }
 
+pub fn try_float(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<f64> {
+    try_float_opt(obj, vm)?
+        .ok_or_else(|| vm.new_type_error(format!("must be real number, not {}", obj.class().name)))
+}
+
 pub(crate) fn to_op_float(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<Option<f64>> {
     let v = if let Some(float) = obj.payload_if_subclass::<PyFloat>(vm) {
         Some(float.value)
@@ -176,7 +181,7 @@ impl PyFloat {
                     val
                 };
 
-                if let Some(f) = try_float(&val, vm)? {
+                if let Some(f) = try_float_opt(&val, vm)? {
                     f
                 } else if let Some(s) = val.payload_if_subclass::<PyStr>(vm) {
                     float_ops::parse_str(s.borrow_value().trim()).ok_or_else(|| {
@@ -581,9 +586,7 @@ impl IntoPyFloat {
 
 impl TryFromObject for IntoPyFloat {
     fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
-        let value = try_float(&obj, vm)?.ok_or_else(|| {
-            vm.new_type_error(format!("must be real number, not {}", obj.class().name))
-        })?;
+        let value = try_float(&obj, vm)?;
         Ok(IntoPyFloat { value })
     }
 }

vm/src/builtins/float.rs

@@ -500,7 +500,7 @@ impl PyMemoryView {
             .get_pos(i)
             .ok_or_else(|| vm.new_index_error("index out of range".to_owned()))?;
         let itemsize = zelf.options.itemsize;
-        let data = zelf.format_spec.pack(&[value], vm)?;
+        let data = zelf.format_spec.pack(vec![value], vm)?;
         zelf.obj_bytes_mut()[i..i + itemsize].copy_from_slice(&data);
         Ok(())
     }

vm/src/builtins/memory.rs

@@ -5,8 +5,7 @@
 
 use num_bigint::BigInt;
 use num_traits::{One, Signed, Zero};
-use statrs::function::erf::{erf, erfc};
-use statrs::function::gamma::{gamma, ln_gamma};
+use puruspe::{erf, erfc, gamma, ln_gamma};
 
 use crate::builtins::float::{self, IntoPyFloat, PyFloatRef};
 use crate::builtins::int::{self, PyInt, PyIntRef};