Merge pull request RustPython#2525 from RustPython/update-deps

Update dependencies

Author: youknowone

Cargo.lock

@@ -26,13 +26,13 @@ ssl = ["rustpython-vm/ssl"]
 
 [dependencies]
 log = "0.4"
-env_logger = "0.7"
+env_logger = "0.8.3"
 clap = "2.33"
 rustpython-compiler = { path = "compiler/porcelain", version = "0.1.1" }
 rustpython-parser = { path = "parser", version = "0.1.1" }
 rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] }
 pylib = { package = "rustpython-pylib", path = "vm/pylib-crate", version = "0.1.0", default-features = false, optional = true }
-dirs = { package = "dirs-next", version = "1.0" }
+dirs = { package = "dirs-next", version = "2.0.0" }
 num-traits = "0.2.8"
 cfg-if = "1.0"
 libc = "0.2"

Cargo.toml

@@ -832,8 +832,6 @@ def test_inf_nan(self):
         self.assertRaises(TypeError, round, NAN, "ceci n'est pas un integer")
         self.assertRaises(TypeError, round, -0.0, 1j)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_large_n(self):
         for n in [324, 325, 400, 2**31-1, 2**31, 2**32, 2**100]:
             self.assertEqual(round(123.456, n), 123.456)
@@ -846,17 +844,13 @@ def test_large_n(self):
         self.assertEqual(round(1e150, 309), 1e150)
         self.assertEqual(round(1.4e-315, 315), 1e-315)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_small_n(self):
         for n in [-308, -309, -400, 1-2**31, -2**31, -2**31-1, -2**100]:
             self.assertEqual(round(123.456, n), 0.0)
             self.assertEqual(round(-123.456, n), -0.0)
             self.assertEqual(round(1e300, n), 0.0)
             self.assertEqual(round(1e-320, n), 0.0)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_overflow(self):
         self.assertRaises(OverflowError, round, 1.6e308, -308)
         self.assertRaises(OverflowError, round, -1.7e308, -308)

Lib/test/test_float.py

@@ -5,4 +5,4 @@ authors = ["RustPython Team"]
 edition = "2018"
 
 [dependencies]
-num-bigint = "0.3"
+num-bigint = "0.4.0"

ast/Cargo.toml

@@ -12,8 +12,8 @@ license = "MIT"
 bincode =  "1.1"
 bitflags = "1.1"
 lz4_flex = "0.7"
-num-bigint = { version = "0.3", features = ["serde"] }
-num-complex = { version = "0.3", features = ["serde"] }
+num-bigint = { version = "0.4.0", features = ["serde"] }
+num-complex = { version = "0.4.0", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
-itertools = "0.9"
+itertools = "0.10.0"
 bstr = "0.2"

bytecode/Cargo.toml

@@ -11,8 +11,8 @@ threading = ["parking_lot"]
 lock_api = "0.4"
 parking_lot = { version = "0.11.0", optional = true }
 num-traits = "0.2"
-num-complex = "0.3"
-num-bigint = "0.3"
+num-complex = "0.4.0"
+num-bigint = "0.4.0"
 lexical-core = "0.7"
 hexf-parse = "0.1.0"
 cfg-if = "1.0"

common/Cargo.toml

@@ -1,5 +1,6 @@
 use num_bigint::{BigInt, ToBigInt};
 use num_traits::{Float, Signed, ToPrimitive, Zero};
+use std::f64;
 
 pub fn ufrexp(value: f64) -> (f64, i32) {
     if 0.0 == value {
@@ -366,6 +367,69 @@ pub fn ulp(x: f64) -> f64 {
     }
 }
 
+pub fn round_float_digits(x: f64, ndigits: i32) -> Option<f64> {
+    let float = if ndigits.is_zero() {
+        let fract = x.fract();
+        if (fract.abs() - 0.5).abs() < f64::EPSILON {
+            if x.trunc() % 2.0 == 0.0 {
+                x - fract
+            } else {
+                x + fract
+            }
+        } else {
+            x.round()
+        }
+    } else {
+        const NDIGITS_MAX: i32 =
+            ((f64::MANTISSA_DIGITS as i32 - f64::MIN_EXP) as f64 * f64::consts::LOG10_2) as i32;
+        const NDIGITS_MIN: i32 = -(((f64::MAX_EXP + 1) as f64 * f64::consts::LOG10_2) as i32);
+        if ndigits > NDIGITS_MAX {
+            x
+        } else if ndigits < NDIGITS_MIN {
+            0.0f64.copysign(x)
+        } else {
+            let (y, pow1, pow2) = if ndigits >= 0 {
+                // according to cpython: pow1 and pow2 are each safe from overflow, but
+                //                       pow1*pow2 ~= pow(10.0, ndigits) might overflow
+                let (pow1, pow2) = if ndigits > 22 {
+                    (10.0.powf((ndigits - 22) as f64), 1e22)
+                } else {
+                    (10.0.powf(ndigits as f64), 1.0)
+                };
+                let y = (x * pow1) * pow2;
+                if !y.is_finite() {
+                    return Some(x);
+                }
+                (y, pow1, Some(pow2))
+            } else {
+                let pow1 = 10.0.powf((-ndigits) as f64);
+                (x / pow1, pow1, None)
+            };
+            let z = y.round();
+            #[allow(clippy::float_cmp)]
+            let z = if (y - z).abs() == 0.5 {
+                2.0 * (y / 2.0).round()
+            } else {
+                z
+            };
+            let z = if let Some(pow2) = pow2 {
+                // ndigits >= 0
+                (z / pow2) / pow1
+            } else {
+                z * pow1
+            };
+
+            if !z.is_finite() {
+                // overflow
+                return None;
+            }
+
+            z
+        }
+    };
+    Some(float)
+}
+
 #[test]
 fn test_to_hex() {
     use rand::Rng;

common/src/float_ops.rs

@@ -9,14 +9,14 @@ edition = "2018"
 
 [dependencies]
 indexmap = "1.0"
-itertools = "0.9"
+itertools = "0.10.0"
 rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
 rustpython-ast = { path = "../ast" }
-num-complex = { version = "0.3", features = ["serde"] }
+num-complex = { version = "0.4.0", features = ["serde"] }
 num-traits = "0.2"
 log = "0.4"
-ahash = "0.6"
+ahash = "0.7.2"
 
 [dev-dependencies]
 rustpython-parser = { path = "../parser" }
-insta = "1.5"
+insta = "1.7.0"

compiler/Cargo.toml

@@ -19,5 +19,5 @@ rustpython-compiler = { path = "../compiler/porcelain", version = "0.1.1" }
 rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
 maplit = "1.0"
 once_cell = "1.3.1"
-textwrap = "0.12.1"
+textwrap = "0.13.4"
 indexmap = "^1"

derive/Cargo.toml

@@ -10,16 +10,16 @@ edition = "2018"
 autotests = false
 
 [dependencies]
-cranelift = "0.69.0"
-cranelift-module = "0.69.0"
-cranelift-jit = "0.69.0"
+cranelift = "0.72.0"
+cranelift-module = "0.72.0"
+cranelift-jit = "0.72.0"
 num-traits = "0.2"
 libffi = "1.0"
 rustpython-bytecode = { path = "../bytecode", version = "0.1.2" }
 thiserror = "1.0"
 
 [dev-dependencies]
-approx = "0.3.2"
+approx = "0.4.0"
 rustpython-derive = { path = "../derive", version = "0.1.2" }
 
 [[test]]