mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Merge pull request #3628 from youknowone/upgrade-libc

Browse Source 
upgrade libc
This commit is contained in:
Jeong YunWon
2022-04-18 00:46:54 +09:00
committed by GitHub
parent 7c85002902 a22341787a
commit ea39443063
12 changed files with 388 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

471
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

18
Cargo.toml
View File

@@ -31,28 +31,28 @@ ssl = ["rustpython-stdlib/ssl"]
ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
[dependencies]
log = "0.4"
log = "0.4.16"
env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
clap = "2.33"
clap = "2.34"
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"] }
rustpython-stdlib = {path = "stdlib", optional = true, default-features = false, features = ["compile-parse"]}
dirs = { package = "dirs-next", version = "2.0.0" }
num-traits = "0.2.8"
cfg-if = "1.0"
libc = "0.2"
num-traits = "0.2.14"
cfg-if = "1.0.0"
libc = "0.2.123"
flame = { version = "0.2", optional = true }
flamescope = { version = "0.1", optional = true }
flame = { version = "0.2.2", optional = true }
flamescope = { version = "0.1.2", optional = true }
[target.'cfg(not(target_os = "wasi"))'.dependencies]
rustyline = "9"
rustyline = "9.1.2"
[dev-dependencies]
cpython = "0.7.0"
python3-sys = "0.7.0"
criterion = "0.3"
criterion = "0.3.5"
[[bench]]
name = "execution"

2
ast/Cargo.toml
View File

@@ -11,5 +11,5 @@ fold = []
unparse = ["rustpython-common"]
[dependencies]
num-bigint = "0.4.2"
num-bigint = "0.4.3"
rustpython-common = { path = "../common", optional = true }

12
bytecode/Cargo.toml
View File

@@ -10,10 +10,10 @@ license = "MIT"
[dependencies]
bincode = "1.3.3"
bitflags = "1.2.1"
lz4_flex = "0.9.0"
num-bigint = { version = "0.4.2", features = ["serde"] }
bitflags = "1.3.2"
lz4_flex = "0.9.2"
num-bigint = { version = "0.4.3", features = ["serde"] }
num-complex = { version = "0.4.0", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
itertools = "0.10.0"
bstr = "0.2"
serde = { version = "1.0.136", features = ["derive"] }
itertools = "0.10.3"
bstr = "0.2.17"

12
compiler/Cargo.toml
View File

@@ -8,15 +8,15 @@ license = "MIT"
edition = "2021"
[dependencies]
indexmap = "1.7.0"
itertools = "0.10.0"
indexmap = "1.8.1"
itertools = "0.10.3"
rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
rustpython-ast = { path = "../ast", features = ["unparse"] }
num-complex = { version = "0.4.0", features = ["serde"] }
num-traits = "0.2"
log = "0.4"
ahash = "0.7.2"
num-traits = "0.2.14"
log = "0.4.16"
ahash = "0.7.6"
[dev-dependencies]
rustpython-parser = { path = "../parser" }
insta = "1.7.0"
insta = "1.14.0"

18
derive/Cargo.toml
View File

@@ -11,14 +11,14 @@ edition = "2021"
proc-macro = true
[dependencies]
syn = { version = "1.0", features = ["full", "extra-traits"] }
syn-ext = { version = "0.3.0", features = ["full"] }
quote = "1.0"
proc-macro2 = "1.0"
syn = { version = "1.0.91", features = ["full", "extra-traits"] }
syn-ext = { version = "0.3.1", features = ["full"] }
quote = "1.0.18"
proc-macro2 = "1.0.37"
rustpython-compiler = { path = "../compiler/porcelain", version = "0.1.1" }
rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
maplit = "1.0"
once_cell = "1.8.0"
textwrap = { version = "0.14.2", default-features = false }
indexmap = "^1"
serde_json = "1.0.68"
maplit = "1.0.2"
once_cell = "1.10.0"
textwrap = { version = "0.15.0", default-features = false }
indexmap = "1.8.1"
serde_json = "1.0.79"

2
jit/Cargo.toml
View File

@@ -19,7 +19,7 @@ rustpython-bytecode = { path = "../bytecode", version = "0.1.2" }
thiserror = "1.0"
[dev-dependencies]
approx = "0.5.0"
approx = "0.5.1"
rustpython-derive = { path = "../derive", version = "0.1.2" }
[[test]]

22
parser/Cargo.toml
View File

@@ -9,19 +9,19 @@ license = "MIT"
edition = "2021"
[build-dependencies]
lalrpop = "0.19.6"
lalrpop = "0.19.7"
[dependencies]
rustpython-ast = { path = "../ast" }
lalrpop-util = "0.19.6"
log = "0.4.1"
num-bigint = "0.4.2"
num-traits = "0.2"
unic-emoji-char = "0.9"
unic-ucd-ident = "0.9"
unicode_names2 = "0.4"
phf = { version = "0.10.0", features = ["macros"] }
ahash = "0.7.2"
lalrpop-util = "0.19.7"
log = "0.4.16"
num-bigint = "0.4.3"
num-traits = "0.2.14"
unic-emoji-char = "0.9.0"
unic-ucd-ident = "0.9.0"
unicode_names2 = "0.5.0"
phf = { version = "0.10.1", features = ["macros"] }
ahash = "0.7.6"
[dev-dependencies]
insta = "1.8.0"
insta = "1.14.0"

96
stdlib/Cargo.toml
View File

@@ -12,60 +12,60 @@ rustpython-vm = { path = "../vm" }
rustpython-common = { path = "../common" }
# random
rand = "0.8"
rand_core = "0.6"
mt19937 = "2.0"
rand = "0.8.5"
rand_core = "0.6.3"
mt19937 = "2.0.1"
# Crypto:
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"
digest = "0.10.3"
md-5 = "0.10.1"
sha-1 = "0.10.0"
sha2 = "0.10.2"
sha3 = "0.10.1"
blake2 = "0.10.4"
## unicode stuff
unicode_names2 = "0.4"
unicode_names2 = "0.5.0"
# TODO: use unic for this; needed for title case:
# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
unicode-casing = "0.1"
unicode-casing = "0.1.0"
# update version all at the same time
unic-char-property = "0.9"
unic-normal = "0.9"
unic-ucd-bidi = "0.9"
unic-ucd-category = "0.9"
unic-ucd-age = "0.9"
unic-ucd-ident = "0.9"
unic-char-property = "0.9.0"
unic-normal = "0.9.0"
unic-ucd-bidi = "0.9.0"
unic-ucd-category = "0.9.0"
unic-ucd-age = "0.9.0"
unic-ucd-ident = "0.9.0"
# compression
adler32 = "1.0.3"
crc32fast = "1.2.0"
flate2 = "1.0.20"
adler32 = "1.2.0"
crc32fast = "1.3.2"
flate2 = "1.0.23"
num-complex = "0.4.0"
num-bigint = "0.4.2"
num-bigint = "0.4.3"
num-integer = "0.1.44"
crossbeam-utils = "0.8.5"
itertools = "0.10.1"
lexical-parse-float = "0.8.0"
crossbeam-utils = "0.8.8"
itertools = "0.10.3"
lexical-parse-float = "0.8.3"
num-traits = "0.2.14"
memchr = "2"
base64 = "0.13"
csv-core = "0.1"
hex = "0.4.0"
puruspe = "0.1"
nix = "0.23"
xml-rs = "0.8"
libc = "0.2.102"
memchr = "2.4.1"
base64 = "0.13.0"
csv-core = "0.1.10"
hex = "0.4.3"
puruspe = "0.1.5"
nix = "0.23.1"
xml-rs = "0.8.4"
libc = "0.2.123"
cfg-if = "1.0.0"
ahash = "0.7.4"
libz-sys = { version = "1.0", optional = true }
num_enum = "0.5.4"
ahash = "0.7.6"
libz-sys = { version = "1.1.5", optional = true }
num_enum = "0.5.7"
ascii = "1.0.0"
[target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
termios = "0.3"
termios = "0.3.3"
[features]
default = ["compile-parse", "pylib"]
@@ -83,21 +83,21 @@ ssl = ["openssl", "openssl-sys", "foreign-types-shared"]
ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
gethostname = "0.2.0"
socket2 = { version = "0.4.0", features = ["all"] }
dns-lookup = "1.0"
openssl = { version = "0.10.32", optional = true }
openssl-sys = { version = "0.9", optional = true }
openssl-probe = { version = "0.1", optional = true }
foreign-types-shared = { version = "0.1", optional = true }
gethostname = "0.2.3"
socket2 = { version = "0.4.4", features = ["all"] }
dns-lookup = "1.0.8"
openssl = { version = "0.10.38", optional = true }
openssl-sys = { version = "0.9.72", optional = true }
openssl-probe = { version = "0.1.5", optional = true }
foreign-types-shared = { version = "0.1.1", optional = true }
[target.'cfg(windows)'.dependencies]
schannel = "0.1"
widestring = "0.4"
paste = "1.0.5"
schannel = "0.1.19"
widestring = "0.5.1"
paste = "1.0.7"
[target.'cfg(windows)'.dependencies.winapi]
version = "0.3"
version = "0.3.9"
features = [
"winsock2", "handleapi", "ws2def", "std", "winbase", "wincrypt", "fileapi", "processenv",
"namedpipeapi", "winnt", "processthreadsapi", "errhandlingapi", "winuser", "synchapi", "wincon",
@@ -105,4 +105,4 @@ features = [
]
[target.'cfg(target_os = "macos")'.dependencies]
system-configuration = "0.4"
system-configuration = "0.5.0"

6
stdlib/src/hashlib.rs
View File

@@ -8,7 +8,7 @@ mod hashlib {
function::{FuncArgs, OptionalArg},
PyResult, PyValue, VirtualMachine,
};
use blake2::{Blake2b, Blake2s};
use blake2::{Blake2b512, Blake2s256};
use digest::DynDigest;
use md5::Md5;
use sha1::Sha1;
@@ -326,11 +326,11 @@ mod hashlib {
}
*/
fn blake2b() -> Self {
Self::new(Blake2b::default())
Self::new(Blake2b512::default())
}
fn blake2s() -> Self {
Self::new(Blake2s::default())
Self::new(Blake2s256::default())
}
fn input(&mut self, data: &[u8]) {

13
stdlib/src/socket.rs
View File

@@ -49,16 +49,17 @@ mod _socket {
#[pyattr(name = "has_ipv6")]
const HAS_IPV6: bool = true;
#[pyattr]
// put IPPROTO_MAX later
use c::{
AF_DECnet, AF_APPLETALK, AF_INET, AF_INET6, AF_IPX, AF_UNSPEC, INADDR_ANY, INADDR_LOOPBACK,
INADDR_NONE, IPPROTO_AH, IPPROTO_DSTOPTS, IPPROTO_EGP, IPPROTO_ESP, IPPROTO_FRAGMENT,
IPPROTO_HOPOPTS, IPPROTO_ICMP, IPPROTO_ICMPV6, IPPROTO_IDP, IPPROTO_IGMP, IPPROTO_IP,
IPPROTO_IP as IPPROTO_IPIP, IPPROTO_IPV6, IPPROTO_MAX, IPPROTO_NONE, IPPROTO_PIM,
IPPROTO_PUP, IPPROTO_RAW, IPPROTO_ROUTING, IPPROTO_TCP, IPPROTO_TCP as SOL_TCP,
IPPROTO_UDP, MSG_CTRUNC, MSG_DONTROUTE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL,
NI_DGRAM, NI_MAXHOST, NI_NAMEREQD, NI_NOFQDN, NI_NUMERICHOST, NI_NUMERICSERV, SHUT_RD,
SHUT_RDWR, SHUT_WR, SOCK_DGRAM, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER,
SO_OOBINLINE, SO_REUSEADDR, SO_TYPE, TCP_NODELAY,
IPPROTO_IP as IPPROTO_IPIP, IPPROTO_IPV6, IPPROTO_NONE, IPPROTO_PIM, IPPROTO_PUP,
IPPROTO_RAW, IPPROTO_ROUTING, IPPROTO_TCP, IPPROTO_TCP as SOL_TCP, IPPROTO_UDP, MSG_CTRUNC,
MSG_DONTROUTE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL, NI_DGRAM, NI_MAXHOST,
NI_NAMEREQD, NI_NOFQDN, NI_NUMERICHOST, NI_NUMERICSERV, SHUT_RD, SHUT_RDWR, SHUT_WR,
SOCK_DGRAM, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER, SO_OOBINLINE,
SO_REUSEADDR, SO_TYPE, TCP_NODELAY,
};
#[cfg(unix)]

96
vm/Cargo.toml
View File

@@ -23,9 +23,9 @@ parser = ["rustpython-parser", "ast"]
[dependencies]
num-complex = { version = "0.4.0", features = ["serde"] }
num-bigint = { version = "0.4.2", features = ["serde"] }
num-traits = "0.2.8"
num-integer = "0.1.41"
num-bigint = { version = "0.4.3", features = ["serde"] }
num-traits = "0.2.14"
num-integer = "0.1.44"
num-rational = "0.4.0"
rustpython-common = { path = "../common" }
rustpython-derive = { path = "../derive", version = "0.1.2" }
@@ -36,40 +36,40 @@ rustpython-compiler-core = { path = "../compiler", optional = true, version = "0
rustpython-bytecode = { path = "../bytecode", version = "0.1.2" }
rustpython-jit = { path = "../jit", optional = true, version = "0.1.2" }
rustpython-pylib = { path = "pylib-crate", optional = true, version = "0.1.0" }
rand = "0.8"
getrandom = { version = "0.2", features = ["js"] }
log = "0.4"
serde = { version = "1.0.66", features = ["derive"] }
rand = "0.8.5"
getrandom = { version = "0.2.6", features = ["js"] }
log = "0.4.16"
serde = { version = "1.0.136", features = ["derive"] }
caseless = "0.2.1"
chrono = { version = "0.4", features = ["wasmbind"] }
itertools = "0.10.0"
hex = "0.4.0"
chrono = { version = "0.4.19", features = ["wasmbind"] }
itertools = "0.10.3"
hex = "0.4.3"
hexf-parse = "0.2.1"
indexmap = "1.0.2"
ahash = "0.7.2"
bitflags = "1.3"
libc = "0.2.119"
nix = "0.23"
paste = "1.0.5"
is-macro = "0.1"
indexmap = "1.8.1"
ahash = "0.7.6"
bitflags = "1.3.2"
libc = "0.2.123"
nix = "0.23.1"
paste = "1.0.7"
is-macro = "0.2.0"
result-like = "0.4.2"
num_enum = "0.5"
bstr = "0.2.12"
crossbeam-utils = "0.8"
parking_lot = "0.11"
thread_local = "1.0"
cfg-if = "1.0"
timsort = "0.1"
num_enum = "0.5.7"
bstr = "0.2.17"
crossbeam-utils = "0.8.8"
parking_lot = "0.12.0"
thread_local = "1.1.4"
cfg-if = "1.0.0"
timsort = "0.1.2"
thiserror = "1.0"
atty = "0.2"
static_assertions = "1.1"
half = "1.6"
memchr = "2"
adler32 = "1.0.3"
flate2 = "1.0.20"
once_cell = "1"
memoffset = "0.6"
optional = "0.5"
atty = "0.2.14"
static_assertions = "1.1.0"
half = "1.8.2"
memchr = "2.4.1"
adler32 = "1.2.0"
flate2 = "1.0.23"
once_cell = "1.10.0"
memoffset = "0.6.5"
optional = "0.5.0"
# RustPython crates implementing functionality based on CPython
sre-engine = "0.1.2"
@@ -77,14 +77,14 @@ sre-engine = "0.1.2"
# sre-engine = { path = "../../sre-engine" }
## unicode stuff
unicode_names2 = "0.4"
unicode_names2 = "0.5.0"
# TODO: use unic for this; needed for title case:
# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
unicode-casing = "0.1"
unicode-casing = "0.1.0"
# update version all at the same time
unic-ucd-bidi = "0.9"
unic-ucd-category = "0.9"
unic-ucd-ident = "0.9"
unic-ucd-bidi = "0.9.0"
unic-ucd-category = "0.9.0"
unic-ucd-ident = "0.9.0"
flame = { version = "0.2", optional = true }
flamer = { version = "0.4", optional = true }
@@ -94,23 +94,23 @@ ascii = "1.0.0"
[target.'cfg(unix)'.dependencies]
exitcode = "1.1.2"
uname = "0.1.1"
strum = "0.21"
strum_macros = "0.21"
strum = "0.24.0"
strum_macros = "0.24.0"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
rustyline = "9"
which = "4.0"
which = "4.2.5"
[target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]
num_cpus = "1"
num_cpus = "1.13.1"
[target.'cfg(windows)'.dependencies]
winreg = "0.10.1"
schannel = "0.1"
widestring = "0.4"
schannel = "0.1.19"
widestring = "0.5.1"
[target.'cfg(windows)'.dependencies.winapi]
version = "0.3"
version = "0.3.9"
features = [
"winsock2", "handleapi", "ws2def", "std", "winbase", "wincrypt", "fileapi", "processenv",
"namedpipeapi", "winnt", "processthreadsapi", "errhandlingapi", "winuser", "synchapi", "wincon",
@@ -118,8 +118,8 @@ features = [
]
[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = "0.2"
wasm-bindgen = "0.2.80"
[build-dependencies]
itertools = "0.10.0"
rustc_version = "0.4"
itertools = "0.10.3"
rustc_version = "0.4.0"