Skip to content

Commit 57abcbb

Browse files
authored
Unrolled build for #148263
Rollup merge of #148263 - clubby789:bump-libc, r=ehuss Unpin `libc` and `rustix` in `compiler` and `rustbook` Closes #147501
2 parents d85276b + c169ea0 commit 57abcbb

File tree

4 files changed

+19
-23
lines changed

4 files changed

+19
-23
lines changed

Cargo.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12881288
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12891289
dependencies = [
12901290
"libc",
1291-
"windows-sys 0.60.2",
1291+
"windows-sys 0.52.0",
12921292
]
12931293

12941294
[[package]]
@@ -2101,9 +2101,9 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"
21012101

21022102
[[package]]
21032103
name = "libc"
2104-
version = "0.2.174"
2104+
version = "0.2.177"
21052105
source = "registry+https://github.com/rust-lang/crates.io-index"
2106-
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
2106+
checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
21072107

21082108
[[package]]
21092109
name = "libdbus-sys"
@@ -2154,7 +2154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21542154
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21552155
dependencies = [
21562156
"cfg-if",
2157-
"windows-targets 0.53.3",
2157+
"windows-targets 0.52.6",
21582158
]
21592159

21602160
[[package]]
@@ -2216,9 +2216,9 @@ dependencies = [
22162216

22172217
[[package]]
22182218
name = "linux-raw-sys"
2219-
version = "0.9.4"
2219+
version = "0.11.0"
22202220
source = "registry+https://github.com/rust-lang/crates.io-index"
2221-
checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
2221+
checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
22222222

22232223
[[package]]
22242224
name = "litemap"
@@ -4897,15 +4897,15 @@ dependencies = [
48974897

48984898
[[package]]
48994899
name = "rustix"
4900-
version = "1.0.8"
4900+
version = "1.1.2"
49014901
source = "registry+https://github.com/rust-lang/crates.io-index"
4902-
checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
4902+
checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
49034903
dependencies = [
49044904
"bitflags",
49054905
"errno",
49064906
"libc",
49074907
"linux-raw-sys",
4908-
"windows-sys 0.60.2",
4908+
"windows-sys 0.52.0",
49094909
]
49104910

49114911
[[package]]

compiler/rustc_session/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ tracing = "0.1"
2727
# tidy-alphabetical-end
2828

2929
[target.'cfg(unix)'.dependencies]
30-
# FIXME: Remove this pin once this rustix issue is resolved
31-
# https://github.com/bytecodealliance/rustix/issues/1496
3230
# tidy-alphabetical-start
33-
libc = "=0.2.174"
31+
libc = "0.2"
3432
# tidy-alphabetical-end
3533

3634
[target.'cfg(windows)'.dependencies.windows]

src/tools/rustbook/Cargo.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
464464
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
465465
dependencies = [
466466
"libc",
467-
"windows-sys 0.60.2",
467+
"windows-sys 0.59.0",
468468
]
469469

470470
[[package]]
@@ -807,9 +807,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
807807

808808
[[package]]
809809
name = "libc"
810-
version = "0.2.174"
810+
version = "0.2.177"
811811
source = "registry+https://github.com/rust-lang/crates.io-index"
812-
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
812+
checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
813813

814814
[[package]]
815815
name = "linereader"
@@ -822,9 +822,9 @@ dependencies = [
822822

823823
[[package]]
824824
name = "linux-raw-sys"
825-
version = "0.9.4"
825+
version = "0.11.0"
826826
source = "registry+https://github.com/rust-lang/crates.io-index"
827-
checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
827+
checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
828828

829829
[[package]]
830830
name = "litemap"
@@ -1394,15 +1394,15 @@ dependencies = [
13941394

13951395
[[package]]
13961396
name = "rustix"
1397-
version = "1.0.8"
1397+
version = "1.1.2"
13981398
source = "registry+https://github.com/rust-lang/crates.io-index"
1399-
checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
1399+
checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
14001400
dependencies = [
14011401
"bitflags 2.9.2",
14021402
"errno",
14031403
"libc",
14041404
"linux-raw-sys",
1405-
"windows-sys 0.60.2",
1405+
"windows-sys 0.59.0",
14061406
]
14071407

14081408
[[package]]

src/tools/rustbook/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ edition = "2021"
1010
[dependencies]
1111
clap = "4.0.32"
1212
env_logger = "0.11"
13-
# FIXME: Remove this pin once this rustix issue is resolved
14-
# https://github.com/bytecodealliance/rustix/issues/1496
15-
libc = "=0.2.174"
13+
libc = "0.2"
1614
mdbook-trpl = { path = "../../doc/book/packages/mdbook-trpl" }
1715
mdbook-i18n-helpers = "0.3.3"
1816
mdbook-spec = { path = "../../doc/reference/mdbook-spec" }

0 commit comments

Comments
 (0)