Skip to content

Commit ea39443

Browse files
youknowoneyouknowone
authored
Merge pull request #3628 from youknowone/upgrade-libc
upgrade libc
2 parents 7c85002 + a223417 commit ea39443

File tree

12 files changed

+387
-379
lines changed

12 files changed

+387
-379
lines changed

‎Cargo.lock

Lines changed: 238 additions & 231 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,28 @@ ssl = ["rustpython-stdlib/ssl"]
3131
ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
3232

3333
[dependencies]
34-
log = "0.4"
34+
log = "0.4.16"
3535
env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
36-
clap = "2.33"
36+
clap = "2.34"
3737
rustpython-compiler = { path = "compiler/porcelain", version = "0.1.1" }
3838
rustpython-parser = { path = "parser", version = "0.1.1" }
3939
rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] }
4040
rustpython-stdlib = {path = "stdlib", optional = true, default-features = false, features = ["compile-parse"]}
4141
dirs = { package = "dirs-next", version = "2.0.0" }
42-
num-traits = "0.2.8"
43-
cfg-if = "1.0"
44-
libc = "0.2"
42+
num-traits = "0.2.14"
43+
cfg-if = "1.0.0"
44+
libc = "0.2.123"
4545

46-
flame = { version = "0.2", optional = true }
47-
flamescope = { version = "0.1", optional = true }
46+
flame = { version = "0.2.2", optional = true }
47+
flamescope = { version = "0.1.2", optional = true }
4848

4949
[target.'cfg(not(target_os = "wasi"))'.dependencies]
50-
rustyline = "9"
50+
rustyline = "9.1.2"
5151

5252
[dev-dependencies]
5353
cpython = "0.7.0"
5454
python3-sys = "0.7.0"
55-
criterion = "0.3"
55+
criterion = "0.3.5"
5656

5757
[[bench]]
5858
name = "execution"

‎ast/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ fold = []
1111
unparse = ["rustpython-common"]
1212

1313
[dependencies]
14-
num-bigint = "0.4.2"
14+
num-bigint = "0.4.3"
1515
rustpython-common = { path = "../common", optional = true }

‎bytecode/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ license = "MIT"
1010

1111
[dependencies]
1212
bincode = "1.3.3"
13-
bitflags = "1.2.1"
14-
lz4_flex = "0.9.0"
15-
num-bigint = { version = "0.4.2", features = ["serde"] }
13+
bitflags = "1.3.2"
14+
lz4_flex = "0.9.2"
15+
num-bigint = { version = "0.4.3", features = ["serde"] }
1616
num-complex = { version = "0.4.0", features = ["serde"] }
17-
serde = { version = "1.0", features = ["derive"] }
18-
itertools = "0.10.0"
19-
bstr = "0.2"
17+
serde = { version = "1.0.136", features = ["derive"] }
18+
itertools = "0.10.3"
19+
bstr = "0.2.17"

‎compiler/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ license = "MIT"
88
edition = "2021"
99

1010
[dependencies]
11-
indexmap = "1.7.0"
12-
itertools = "0.10.0"
11+
indexmap = "1.8.1"
12+
itertools = "0.10.3"
1313
rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
1414
rustpython-ast = { path = "../ast", features = ["unparse"] }
1515
num-complex = { version = "0.4.0", features = ["serde"] }
16-
num-traits = "0.2"
17-
log = "0.4"
18-
ahash = "0.7.2"
16+
num-traits = "0.2.14"
17+
log = "0.4.16"
18+
ahash = "0.7.6"
1919

2020
[dev-dependencies]
2121
rustpython-parser = { path = "../parser" }
22-
insta = "1.7.0"
22+
insta = "1.14.0"

‎derive/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ edition = "2021"
1111
proc-macro = true
1212

1313
[dependencies]
14-
syn = { version = "1.0", features = ["full", "extra-traits"] }
15-
syn-ext = { version = "0.3.0", features = ["full"] }
16-
quote = "1.0"
17-
proc-macro2 = "1.0"
14+
syn = { version = "1.0.91", features = ["full", "extra-traits"] }
15+
syn-ext = { version = "0.3.1", features = ["full"] }
16+
quote = "1.0.18"
17+
proc-macro2 = "1.0.37"
1818
rustpython-compiler = { path = "../compiler/porcelain", version = "0.1.1" }
1919
rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
20-
maplit = "1.0"
21-
once_cell = "1.8.0"
22-
textwrap = { version = "0.14.2", default-features = false }
23-
indexmap = "^1"
24-
serde_json = "1.0.68"
20+
maplit = "1.0.2"
21+
once_cell = "1.10.0"
22+
textwrap = { version = "0.15.0", default-features = false }
23+
indexmap = "1.8.1"
24+
serde_json = "1.0.79"

‎jit/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rustpython-bytecode = { path = "../bytecode", version = "0.1.2" }
1919
thiserror = "1.0"
2020

2121
[dev-dependencies]
22-
approx = "0.5.0"
22+
approx = "0.5.1"
2323
rustpython-derive = { path = "../derive", version = "0.1.2" }
2424

2525
[[test]]

‎parser/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ license = "MIT"
99
edition = "2021"
1010

1111
[build-dependencies]
12-
lalrpop = "0.19.6"
12+
lalrpop = "0.19.7"
1313

1414
[dependencies]
1515
rustpython-ast = { path = "../ast" }
16-
lalrpop-util = "0.19.6"
17-
log = "0.4.1"
18-
num-bigint = "0.4.2"
19-
num-traits = "0.2"
20-
unic-emoji-char = "0.9"
21-
unic-ucd-ident = "0.9"
22-
unicode_names2 = "0.4"
23-
phf = { version = "0.10.0", features = ["macros"] }
24-
ahash = "0.7.2"
16+
lalrpop-util = "0.19.7"
17+
log = "0.4.16"
18+
num-bigint = "0.4.3"
19+
num-traits = "0.2.14"
20+
unic-emoji-char = "0.9.0"
21+
unic-ucd-ident = "0.9.0"
22+
unicode_names2 = "0.5.0"
23+
phf = { version = "0.10.1", features = ["macros"] }
24+
ahash = "0.7.6"
2525

2626
[dev-dependencies]
27-
insta = "1.8.0"
27+
insta = "1.14.0"

‎stdlib/Cargo.toml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -12,60 +12,60 @@ rustpython-vm = { path = "../vm" }
1212
rustpython-common = { path = "../common" }
1313

1414
# random
15-
rand = "0.8"
16-
rand_core = "0.6"
17-
mt19937 = "2.0"
15+
rand = "0.8.5"
16+
rand_core = "0.6.3"
17+
mt19937 = "2.0.1"
1818

1919
# Crypto:
20-
digest = "0.9.0"
21-
md-5 = "0.9.1"
22-
sha-1 = "0.9.4"
23-
sha2 = "0.9.3"
24-
sha3 = "0.9.1"
25-
blake2 = "0.9.1"
20+
digest = "0.10.3"
21+
md-5 = "0.10.1"
22+
sha-1 = "0.10.0"
23+
sha2 = "0.10.2"
24+
sha3 = "0.10.1"
25+
blake2 = "0.10.4"
2626

2727
## unicode stuff
28-
unicode_names2 = "0.4"
28+
unicode_names2 = "0.5.0"
2929
# TODO: use unic for this; needed for title case:
3030
# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
31-
unicode-casing = "0.1"
31+
unicode-casing = "0.1.0"
3232
# update version all at the same time
33-
unic-char-property = "0.9"
34-
unic-normal = "0.9"
35-
unic-ucd-bidi = "0.9"
36-
unic-ucd-category = "0.9"
37-
unic-ucd-age = "0.9"
38-
unic-ucd-ident = "0.9"
33+
unic-char-property = "0.9.0"
34+
unic-normal = "0.9.0"
35+
unic-ucd-bidi = "0.9.0"
36+
unic-ucd-category = "0.9.0"
37+
unic-ucd-age = "0.9.0"
38+
unic-ucd-ident = "0.9.0"
3939

4040
# compression
41-
adler32 = "1.0.3"
42-
crc32fast = "1.2.0"
43-
flate2 = "1.0.20"
41+
adler32 = "1.2.0"
42+
crc32fast = "1.3.2"
43+
flate2 = "1.0.23"
4444

4545
num-complex = "0.4.0"
46-
num-bigint = "0.4.2"
46+
num-bigint = "0.4.3"
4747
num-integer = "0.1.44"
4848

49-
crossbeam-utils = "0.8.5"
50-
itertools = "0.10.1"
51-
lexical-parse-float = "0.8.0"
49+
crossbeam-utils = "0.8.8"
50+
itertools = "0.10.3"
51+
lexical-parse-float = "0.8.3"
5252
num-traits = "0.2.14"
53-
memchr = "2"
54-
base64 = "0.13"
55-
csv-core = "0.1"
56-
hex = "0.4.0"
57-
puruspe = "0.1"
58-
nix = "0.23"
59-
xml-rs = "0.8"
60-
libc = "0.2.102"
53+
memchr = "2.4.1"
54+
base64 = "0.13.0"
55+
csv-core = "0.1.10"
56+
hex = "0.4.3"
57+
puruspe = "0.1.5"
58+
nix = "0.23.1"
59+
xml-rs = "0.8.4"
60+
libc = "0.2.123"
6161
cfg-if = "1.0.0"
62-
ahash = "0.7.4"
63-
libz-sys = { version = "1.0", optional = true }
64-
num_enum = "0.5.4"
62+
ahash = "0.7.6"
63+
libz-sys = { version = "1.1.5", optional = true }
64+
num_enum = "0.5.7"
6565
ascii = "1.0.0"
6666

6767
[target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
68-
termios = "0.3"
68+
termios = "0.3.3"
6969

7070
[features]
7171
default = ["compile-parse", "pylib"]
@@ -83,26 +83,26 @@ ssl = ["openssl", "openssl-sys", "foreign-types-shared"]
8383
ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"]
8484

8585
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
86-
gethostname = "0.2.0"
87-
socket2 = { version = "0.4.0", features = ["all"] }
88-
dns-lookup = "1.0"
89-
openssl = { version = "0.10.32", optional = true }
90-
openssl-sys = { version = "0.9", optional = true }
91-
openssl-probe = { version = "0.1", optional = true }
92-
foreign-types-shared = { version = "0.1", optional = true }
86+
gethostname = "0.2.3"
87+
socket2 = { version = "0.4.4", features = ["all"] }
88+
dns-lookup = "1.0.8"
89+
openssl = { version = "0.10.38", optional = true }
90+
openssl-sys = { version = "0.9.72", optional = true }
91+
openssl-probe = { version = "0.1.5", optional = true }
92+
foreign-types-shared = { version = "0.1.1", optional = true }
9393

9494
[target.'cfg(windows)'.dependencies]
95-
schannel = "0.1"
96-
widestring = "0.4"
97-
paste = "1.0.5"
95+
schannel = "0.1.19"
96+
widestring = "0.5.1"
97+
paste = "1.0.7"
9898

9999
[target.'cfg(windows)'.dependencies.winapi]
100-
version = "0.3"
100+
version = "0.3.9"
101101
features = [
102102
"winsock2", "handleapi", "ws2def", "std", "winbase", "wincrypt", "fileapi", "processenv",
103103
"namedpipeapi", "winnt", "processthreadsapi", "errhandlingapi", "winuser", "synchapi", "wincon",
104104
"impl-default", "vcruntime", "ifdef", "netioapi"
105105
]
106106

107107
[target.'cfg(target_os = "macos")'.dependencies]
108-
system-configuration = "0.4"
108+
system-configuration = "0.5.0"

‎stdlib/src/hashlib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod hashlib {
88
function::{FuncArgs, OptionalArg},
99
PyResult, PyValue, VirtualMachine,
1010
};
11-
use blake2::{Blake2b, Blake2s};
11+
use blake2::{Blake2b512, Blake2s256};
1212
use digest::DynDigest;
1313
use md5::Md5;
1414
use sha1::Sha1;
@@ -326,11 +326,11 @@ mod hashlib {
326326
}
327327
*/
328328
fn blake2b() -> Self {
329-
Self::new(Blake2b::default())
329+
Self::new(Blake2b512::default())
330330
}
331331

332332
fn blake2s() -> Self {
333-
Self::new(Blake2s::default())
333+
Self::new(Blake2s256::default())
334334
}
335335

336336
fn input(&mut self, data: &[u8]) {

‎stdlib/src/socket.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,17 @@ mod _socket {
4949
#[pyattr(name = "has_ipv6")]
5050
const HAS_IPV6: bool = true;
5151
#[pyattr]
52+
// put IPPROTO_MAX later
5253
use c::{
5354
AF_DECnet, AF_APPLETALK, AF_INET, AF_INET6, AF_IPX, AF_UNSPEC, INADDR_ANY, INADDR_LOOPBACK,
5455
INADDR_NONE, IPPROTO_AH, IPPROTO_DSTOPTS, IPPROTO_EGP, IPPROTO_ESP, IPPROTO_FRAGMENT,
5556
IPPROTO_HOPOPTS, IPPROTO_ICMP, IPPROTO_ICMPV6, IPPROTO_IDP, IPPROTO_IGMP, IPPROTO_IP,
56-
IPPROTO_IP as IPPROTO_IPIP, IPPROTO_IPV6, IPPROTO_MAX, IPPROTO_NONE, IPPROTO_PIM,
57-
IPPROTO_PUP, IPPROTO_RAW, IPPROTO_ROUTING, IPPROTO_TCP, IPPROTO_TCP as SOL_TCP,
58-
IPPROTO_UDP, MSG_CTRUNC, MSG_DONTROUTE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL,
59-
NI_DGRAM, NI_MAXHOST, NI_NAMEREQD, NI_NOFQDN, NI_NUMERICHOST, NI_NUMERICSERV, SHUT_RD,
60-
SHUT_RDWR, SHUT_WR, SOCK_DGRAM, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER,
61-
SO_OOBINLINE, SO_REUSEADDR, SO_TYPE, TCP_NODELAY,
57+
IPPROTO_IP as IPPROTO_IPIP, IPPROTO_IPV6, IPPROTO_NONE, IPPROTO_PIM, IPPROTO_PUP,
58+
IPPROTO_RAW, IPPROTO_ROUTING, IPPROTO_TCP, IPPROTO_TCP as SOL_TCP, IPPROTO_UDP, MSG_CTRUNC,
59+
MSG_DONTROUTE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL, NI_DGRAM, NI_MAXHOST,
60+
NI_NAMEREQD, NI_NOFQDN, NI_NUMERICHOST, NI_NUMERICSERV, SHUT_RD, SHUT_RDWR, SHUT_WR,
61+
SOCK_DGRAM, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER, SO_OOBINLINE,
62+
SO_REUSEADDR, SO_TYPE, TCP_NODELAY,
6263
};
6364

6465
#[cfg(unix)]

0 commit comments

Comments
 (0)