Skip to content

Commit

Permalink
Auto merge of #113276 - Nilstrieb:rustix, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Update rustix

The issue has been fixed.
bytecodealliance/rustix#716
  • Loading branch information
bors committed Jul 9, 2023
2 parents 03247fb + dd19f1f commit f05d743
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
15 changes: 7 additions & 8 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1724,7 +1724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
dependencies = [
"hermit-abi 0.3.1",
"rustix 0.38.1",
"rustix 0.38.2",
"windows-sys 0.48.0",
]

Expand Down Expand Up @@ -3159,7 +3159,6 @@ name = "rustc_driver"
version = "0.0.0"
dependencies = [
"rustc_driver_impl",
"rustix 0.37.11",
]

[[package]]
Expand Down Expand Up @@ -4218,9 +4217,9 @@ dependencies = [

[[package]]
name = "rustix"
version = "0.37.11"
version = "0.37.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
dependencies = [
"bitflags 1.3.2",
"errno",
Expand All @@ -4232,9 +4231,9 @@ dependencies = [

[[package]]
name = "rustix"
version = "0.38.1"
version = "0.38.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3"
checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
dependencies = [
"bitflags 2.3.3",
"errno",
Expand Down Expand Up @@ -4660,7 +4659,7 @@ dependencies = [
"cfg-if",
"fastrand",
"redox_syscall 0.3.5",
"rustix 0.37.11",
"rustix 0.37.22",
"windows-sys 0.48.0",
]

Expand Down Expand Up @@ -4701,7 +4700,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
dependencies = [
"rustix 0.37.11",
"rustix 0.37.22",
"windows-sys 0.48.0",
]

Expand Down
3 changes: 0 additions & 3 deletions compiler/rustc_driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ crate-type = ["dylib"]

[dependencies]
rustc_driver_impl = { path = "../rustc_driver_impl" }
# FIXME(Nilstrieb): 0.37.12 adds eventfd support for FreeBSD,
# but FreeBSD 12 does not support it: https://github.com/bytecodealliance/rustix/issues/716
rustix = "=0.37.11"
2 changes: 2 additions & 0 deletions src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"elsa",
"ena",
"equivalent",
"errno",
"errno-dragonfly",
"expect-test",
"fallible-iterator", // dependency of `thorin`
"fastrand",
Expand Down

0 comments on commit f05d743

Please sign in to comment.