Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update rustix #113276

Merged
merged 1 commit into from
Jul 9, 2023
Merged

Update rustix #113276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,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 @@ -3218,7 +3218,6 @@ name = "rustc_driver"
version = "0.0.0"
dependencies = [
"rustc_driver_impl",
"rustix 0.37.11",
]

[[package]]
Expand Down Expand Up @@ -4279,9 +4278,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 @@ -4293,9 +4292,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 @@ -4721,7 +4720,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 @@ -4762,7 +4761,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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"elsa",
"ena",
"equivalent",
"errno",
"errno-dragonfly",
Comment on lines +146 to +147
Copy link
Contributor

@klensy klensy Jul 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, probably that's why it appears here https://github.com/rust-lang/rust/pull/113449/files#diff-1b98ff2ba41d961103aadb79662434330725d9503ca09496820a171d37390a95

At least one of reasons.

"expect-test",
"fallible-iterator", // dependency of `thorin`
"fastrand",
Expand Down