Skip to content

upgrade libc #3628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
469 changes: 238 additions & 231 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 6 deletions bytecode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 6 deletions compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 9 additions & 9 deletions derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion jit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
22 changes: 11 additions & 11 deletions parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 48 additions & 48 deletions stdlib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -83,26 +83,26 @@ 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",
"impl-default", "vcruntime", "ifdef", "netioapi"
]

[target.'cfg(target_os = "macos")'.dependencies]
system-configuration = "0.4"
system-configuration = "0.5.0"
6 changes: 3 additions & 3 deletions stdlib/src/hashlib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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]) {
Expand Down
13 changes: 7 additions & 6 deletions stdlib/src/socket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Loading