Merge pull request RustPython#2029 from RustPython/coolreader18/update-deps

Update dependencies

Author: youknowone

Cargo.lock

@@ -11,8 +11,8 @@ license = "MIT"
 [dependencies]
 bincode =  "1.1"
 bitflags = "1.1"
-lz4-compress = "0.1.1"
+lz4-compression = "0.7"
 num-bigint = { version = "0.3", features = ["serde"] }
 num-complex = { version = "0.2", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
-itertools = "0.8"
+itertools = "0.9"

bytecode/Cargo.toml

@@ -409,14 +409,15 @@ impl CodeObject {
 
     /// Load a code object from bytes
     pub fn from_bytes(data: &[u8]) -> Result<Self, Box<dyn std::error::Error>> {
-        let data = lz4_compress::decompress(data)?;
+        let data = lz4_compression::decompress::decompress(data)
+            .map_err(|e| format!("lz4 error: {:?}", e))?;
         bincode::deserialize::<Self>(&data).map_err(|e| e.into())
     }
 
     /// Serialize this bytecode to bytes.
     pub fn to_bytes(&self) -> Vec<u8> {
         let data = bincode::serialize(&self).expect("Code object must be serializable");
-        lz4_compress::compress(&data)
+        lz4_compression::compress::compress(&data)
     }
 
     pub fn get_constants(&self) -> impl Iterator<Item = &Constant> {

bytecode/src/bytecode.rs

@@ -11,7 +11,7 @@ threading = ["parking_lot"]
 parking_lot = { version = "0.11.0", optional = true }
 num-traits = "0.2"
 num-bigint = "0.3"
-lexical = "4"
+lexical-core = "0.7"
 hexf-parse = "0.1.0"
 cfg-if = "0.1"
 

common/Cargo.toml

@@ -72,7 +72,7 @@ pub fn parse_str(literal: &str) -> Option<f64> {
         last_tok = Some(c);
     }
 
-    if let Ok(f) = lexical::parse(buf.as_str()) {
+    if let Ok(f) = lexical_core::parse(buf.as_bytes()) {
         Some(f)
     } else {
         None

common/src/float_ops.rs

@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 indexmap = "1.0"
-itertools = "0.8.0"
+itertools = "0.9"
 rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
 rustpython-parser = { path = "../parser", version = "0.1.1" }
 num-complex = { version = "0.2", features = ["serde"] }

compiler/Cargo.toml

@@ -9,10 +9,10 @@ license = "MIT"
 edition = "2018"
 
 [build-dependencies]
-lalrpop="0.17"
+lalrpop="0.19"
 
 [dependencies]
-lalrpop-util = "0.17"
+lalrpop-util = "0.19"
 log = "0.4.1"
 num-bigint = "0.3"
 num-traits = "0.2"

parser/Cargo.toml

@@ -52,8 +52,8 @@ statrs = "0.12.0"
 caseless = "0.2.1"
 chrono = { version = "0.4", features = ["wasmbind"] }
 once_cell = "1.3.1"
-lexical = "4"
-itertools = "0.8"
+lexical-core = "0.7"
+itertools = "0.9"
 hex = "0.4.0"
 hexf-parse = "0.1.0"
 indexmap = "1.0.2"
@@ -92,7 +92,8 @@ unic-ucd-age       = "0.9"
 unic-ucd-ident     = "0.9"
 
 flame = { version = "0.2", optional = true }
-flamer = { version = "0.3", optional = true }
+flamer = { version = "0.4", optional = true }
+
 rustpython-common = { path = "../common" }
 
 [target.'cfg(unix)'.dependencies]
@@ -134,4 +135,4 @@ features = [
 wasm-bindgen = "0.2"
 
 [build-dependencies]
-itertools = "0.8"
+itertools = "0.9"

vm/Cargo.toml

@@ -20,7 +20,6 @@ extern crate flamer;
 
 #[macro_use]
 extern crate bitflags;
-extern crate lexical;
 #[macro_use]
 extern crate log;
 #[macro_use]

vm/src/lib.rs

@@ -513,7 +513,7 @@ fn to_float(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<f64> {
             vm.new_value_error(format!("could not convert string to float: '{}'", s))
         })?
     } else if let Some(bytes) = obj.payload_if_subclass::<PyBytes>(vm) {
-        lexical::parse(bytes.get_value()).map_err(|_| {
+        lexical_core::parse(bytes.get_value()).map_err(|_| {
             vm.new_value_error(format!(
                 "could not convert string to float: '{}'",
                 bytes.repr()