Skip to content

Commit f05d743

Browse files
committed
Auto merge of #113276 - Nilstrieb:rustix, r=Mark-Simulacrum
Update rustix The issue has been fixed. bytecodealliance/rustix#716
2 parents 03247fb + dd19f1f commit f05d743

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

Cargo.lock

+7-8
Original file line numberDiff line numberDiff line change
@@ -1724,7 +1724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
17241724
checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
17251725
dependencies = [
17261726
"hermit-abi 0.3.1",
1727-
"rustix 0.38.1",
1727+
"rustix 0.38.2",
17281728
"windows-sys 0.48.0",
17291729
]
17301730

@@ -3159,7 +3159,6 @@ name = "rustc_driver"
31593159
version = "0.0.0"
31603160
dependencies = [
31613161
"rustc_driver_impl",
3162-
"rustix 0.37.11",
31633162
]
31643163

31653164
[[package]]
@@ -4218,9 +4217,9 @@ dependencies = [
42184217

42194218
[[package]]
42204219
name = "rustix"
4221-
version = "0.37.11"
4220+
version = "0.37.22"
42224221
source = "registry+https://github.com/rust-lang/crates.io-index"
4223-
checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
4222+
checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
42244223
dependencies = [
42254224
"bitflags 1.3.2",
42264225
"errno",
@@ -4232,9 +4231,9 @@ dependencies = [
42324231

42334232
[[package]]
42344233
name = "rustix"
4235-
version = "0.38.1"
4234+
version = "0.38.2"
42364235
source = "registry+https://github.com/rust-lang/crates.io-index"
4237-
checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3"
4236+
checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
42384237
dependencies = [
42394238
"bitflags 2.3.3",
42404239
"errno",
@@ -4660,7 +4659,7 @@ dependencies = [
46604659
"cfg-if",
46614660
"fastrand",
46624661
"redox_syscall 0.3.5",
4663-
"rustix 0.37.11",
4662+
"rustix 0.37.22",
46644663
"windows-sys 0.48.0",
46654664
]
46664665

@@ -4701,7 +4700,7 @@ version = "0.2.6"
47014700
source = "registry+https://github.com/rust-lang/crates.io-index"
47024701
checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
47034702
dependencies = [
4704-
"rustix 0.37.11",
4703+
"rustix 0.37.22",
47054704
"windows-sys 0.48.0",
47064705
]
47074706

compiler/rustc_driver/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
rustc_driver_impl = { path = "../rustc_driver_impl" }
11-
# FIXME(Nilstrieb): 0.37.12 adds eventfd support for FreeBSD,
12-
# but FreeBSD 12 does not support it: https://github.com/bytecodealliance/rustix/issues/716
13-
rustix = "=0.37.11"

src/tools/tidy/src/deps.rs

+2
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
142142
"elsa",
143143
"ena",
144144
"equivalent",
145+
"errno",
146+
"errno-dragonfly",
145147
"expect-test",
146148
"fallible-iterator", // dependency of `thorin`
147149
"fastrand",

0 commit comments

Comments
 (0)