Upgrade dependencies

coolreader18 · coolreader18 · commit 25ecd7c38b4b · 2021-03-25T08:06:56.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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"
diff --git a/ast/Cargo.toml b/ast/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["RustPython Team"]
 edition = "2018"
 
 [dependencies]
-num-bigint = "0.3"
+num-bigint = "0.4.0"
diff --git a/bytecode/Cargo.toml b/bytecode/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"
diff --git a/common/Cargo.toml b/common/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"
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -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"
diff --git a/derive/Cargo.toml b/derive/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"
diff --git a/jit/Cargo.toml b/jit/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]]
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -15,13 +15,13 @@ lalrpop = "0.19"
 rustpython-ast = { path = "../ast" }
 lalrpop-util = "0.19.1"
 log = "0.4.1"
-num-bigint = "0.3"
+num-bigint = "0.4.0"
 num-traits = "0.2"
 unic-emoji-char = "0.9"
 unic-ucd-ident  = "0.9"
 unicode_names2 = "0.4"
 phf = { version = "0.8", features = ["macros"] }
-ahash = "0.6"
+ahash = "0.7.2"
 
 [dev-dependencies]
 insta = "1.5"
diff --git a/src/shell/helper.rs b/src/shell/helper.rs
@@ -163,8 +163,9 @@ cfg_if::cfg_if! {
                     .unwrap_or_else(|| (line.len(), vec!["\t".to_owned()])))
             }
         }
+
         impl Hinter for ShellHelper<'_> {
-                type Hint = String;
+            type Hint = String;
         }
         impl Highlighter for ShellHelper<'_> {}
         impl Validator for ShellHelper<'_> {}
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -26,18 +26,18 @@ ssl = ["openssl", "openssl-sys", "openssl-probe"]
 
 [dependencies]
 # Crypto:
-digest = "0.8.1"
-md-5 = "0.8"
-sha-1 = "0.8"
-sha2 = "0.8"
-sha3 = "0.8"
-blake2 = "0.8"
-
-num-complex = { version = "0.3", features = ["serde"] }
-num-bigint = { version = "0.3", features = ["serde"] }
+digest = "0.9.0"
+md-5 = "0.9.1"
+sha-1 = "0.9.4"
+sha2 = "0.9.3"
+sha3 = "0.9.1"
+blake2 = "0.9.1"
+
+num-complex = { version = "0.4.0", features = ["serde"] }
+num-bigint = { version = "0.4.0", features = ["serde"] }
 num-traits = "0.2.8"
 num-integer = "0.1.41"
-num-rational = "0.3"
+num-rational = "0.4.0"
 num-iter = "0.1.39"
 rand = "0.8"
 rand_core = "0.6"
@@ -54,22 +54,22 @@ rustpython-pylib = { path = "pylib-crate", optional = true, version = "0.1.0" }
 serde = { version = "1.0.66", features = ["derive"] }
 serde_json = "1.0"
 regex = "1"
-rustc_version_runtime = "0.1.*"
+rustc_version_runtime = "0.2.0"
 puruspe = "0.1"
 caseless = "0.2.1"
 chrono = { version = "0.4", features = ["wasmbind"] }
 lexical-core = "0.7"
-itertools = "0.9"
+itertools = "0.10.0"
 hex = "0.4.0"
 hexf-parse = "0.1.0"
 indexmap = "1.0.2"
-ahash = "0.6"
+ahash = "0.7.2"
 crc = "^1.0.0"
 bitflags = "1.2.1"
 libc = "0.2"
-nix = "0.19"
+nix = "0.20.0"
 csv-core = "0.1"
-paste = "0.1"
+paste = "1.0.5"
 base64 = "0.13"
 is-macro = "0.1"
 result-like = "^0.3"
@@ -121,7 +121,7 @@ uname = "0.1.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 gethostname = "0.2.0"
-socket2 = "0.3.19"
+socket2 = "0.4.0"
 rustyline = "8.0"
 openssl = { version = "0.10.32", features = ["vendored"], optional = true }
 openssl-sys = { version = "0.9", optional = true }
@@ -135,7 +135,7 @@ num_cpus = "1"
 dns-lookup = "1.0"
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.7"
+winreg = "0.8.0"
 schannel = "0.1"
 
 [target.'cfg(windows)'.dependencies.winapi]
@@ -153,4 +153,4 @@ wasm-bindgen = "0.2"
 filepath = "0.1.1"
 
 [build-dependencies]
-itertools = "0.9"
+itertools = "0.10.0"
diff --git a/vm/src/builtins/memory.rs b/vm/src/builtins/memory.rs
@@ -264,7 +264,7 @@ impl PyMemoryView {
     #[pymethod]
     fn release(&self) {
         // avoid double release
-        if !self.released.compare_and_swap(false, true) && self.exports.load() == 0 {
+        if self.released.compare_exchange(false, true).is_ok() && self.exports.load() == 0 {
             self.buffer.release();
         }
     }
diff --git a/vm/src/stdlib/hashlib.rs b/vm/src/stdlib/hashlib.rs
@@ -270,7 +270,7 @@ mod hashlib {
         }
 
         fn input(&mut self, data: &[u8]) {
-            self.inner.input(data);
+            self.inner.update(data);
         }
 
         fn digest_size(&self) -> usize {
@@ -279,7 +279,7 @@ mod hashlib {
 
         fn get_digest(&self) -> Vec<u8> {
             let cloned = self.inner.box_clone();
-            cloned.result().to_vec()
+            cloned.finalize().into_vec()
         }
     }
 }
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
@@ -5,6 +5,7 @@ use nix::unistd::sethostname;
 use socket2::{Domain, Protocol, Socket, Type as SocketType};
 use std::convert::TryFrom;
 use std::io;
+use std::mem::MaybeUninit;
 use std::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr, ToSocketAddrs};
 use std::time::{Duration, Instant};
 
@@ -317,12 +318,12 @@ impl PySocket {
         vm: &VirtualMachine,
     ) -> PyResult<Vec<u8>> {
         let flags = flags.unwrap_or(0);
-        let mut buffer = vec![0u8; bufsize];
+        let mut buffer = Vec::with_capacity(bufsize);
         let sock = self.sock();
         let n = self.sock_op(vm, SelectKind::Read, || {
-            sock.recv_with_flags(&mut buffer, flags)
+            sock.recv_with_flags(spare_capacity_mut(&mut buffer), flags)
         })?;
-        buffer.truncate(n);
+        unsafe { buffer.set_len(n) };
         Ok(buffer)
     }
 
@@ -336,7 +337,7 @@ impl PySocket {
         let flags = flags.unwrap_or(0);
         let sock = self.sock();
         self.sock_op(vm, SelectKind::Read, || {
-            buf.with_ref(|buf| sock.recv_with_flags(buf, flags))
+            buf.with_ref(|buf| sock.recv_with_flags(slice_as_uninit(buf), flags))
         })
     }
 
@@ -348,11 +349,12 @@ impl PySocket {
         vm: &VirtualMachine,
     ) -> PyResult<(Vec<u8>, PyObjectRef)> {
         let flags = flags.unwrap_or(0);
-        let mut buffer = vec![0u8; bufsize];
+        let mut buffer = Vec::with_capacity(bufsize);
         let (n, addr) = self.sock_op(vm, SelectKind::Read, || {
-            self.sock().recv_from_with_flags(&mut buffer, flags)
+            self.sock()
+                .recv_from_with_flags(spare_capacity_mut(&mut buffer), flags)
         })?;
-        buffer.truncate(n);
+        unsafe { buffer.set_len(n) };
         Ok((buffer, get_addr_tuple(addr, vm)))
     }
 
@@ -657,7 +659,7 @@ impl Address {
 
 fn get_addr_tuple<A: Into<socket2::SockAddr>>(addr: A, vm: &VirtualMachine) -> PyObjectRef {
     let addr = addr.into();
-    match addr.as_std() {
+    match addr.as_socket() {
         Some(SocketAddr::V4(addr)) => (addr.ip().to_string(), addr.port()).into_pyobject(vm),
         Some(SocketAddr::V6(addr)) => (
             addr.ip().to_string(),
@@ -716,6 +718,17 @@ fn _socket_getservbyname(
     Ok(vm.ctx.new_int(u16::from_be(port as u16)))
 }
 
+// TODO: use `Vec::spare_capacity_mut` once stable.
+fn spare_capacity_mut<T>(v: &mut Vec<T>) -> &mut [MaybeUninit<T>] {
+    let (len, cap) = (v.len(), v.capacity());
+    unsafe {
+        std::slice::from_raw_parts_mut(v.as_mut_ptr().add(len) as *mut MaybeUninit<T>, cap - len)
+    }
+}
+fn slice_as_uninit<T>(v: &mut [T]) -> &mut [MaybeUninit<T>] {
+    unsafe { &mut *(v as *mut [T] as *mut [MaybeUninit<T>]) }
+}
+
 #[derive(Copy, Clone)]
 enum SelectKind {
     Read,

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,9 @@ cfg_if::cfg_if! {`
`163`	`163`	`.unwrap_or_else(\|\| (line.len(), vec!["\t".to_owned()])))`
`164`	`164`	`}`
`165`	`165`	`}`
	`166`	`+`
`166`	`167`	`impl Hinter for ShellHelper<'_> {`
`167`		`- type Hint = String;`
	`168`	`+ type Hint = String;`
`168`	`169`	`}`
`169`	`170`	`impl Highlighter for ShellHelper<'_> {}`
`170`	`171`	`impl Validator for ShellHelper<'_> {}`