about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNilstrieb <48135649+Nilstrieb@users.noreply.github.com>2023-07-03 07:14:04 +0000
committerNilstrieb <48135649+Nilstrieb@users.noreply.github.com>2023-07-03 07:20:51 +0000
commitdd19f1f5273444b3db365f12bcfd67bb6bea6c90 (patch)
treea31917db82282e4184dd2d774d814fbcb03af58d
parentd5a74249c843e06b502fb097ebea2383b9a5d9b8 (diff)
downloadrust-dd19f1f5273444b3db365f12bcfd67bb6bea6c90.tar.gz
rust-dd19f1f5273444b3db365f12bcfd67bb6bea6c90.zip
Update rustix
The issue has been fixed.
-rw-r--r--Cargo.lock15
-rw-r--r--compiler/rustc_driver/Cargo.toml3
-rw-r--r--src/tools/tidy/src/deps.rs2
3 files changed, 9 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 5bc2dc5eefa..b3cc8206bcf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
 ]
 
@@ -3218,7 +3218,6 @@ name = "rustc_driver"
 version = "0.0.0"
 dependencies = [
  "rustc_driver_impl",
- "rustix 0.37.11",
 ]
 
 [[package]]
@@ -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",
@@ -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",
@@ -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",
 ]
 
@@ -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",
 ]
 
diff --git a/compiler/rustc_driver/Cargo.toml b/compiler/rustc_driver/Cargo.toml
index 86a54f6befd..d7c295418ba 100644
--- a/compiler/rustc_driver/Cargo.toml
+++ b/compiler/rustc_driver/Cargo.toml
@@ -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"
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index b6c57342a05..c201712069c 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -143,6 +143,8 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
     "elsa",
     "ena",
     "equivalent",
+    "errno",
+    "errno-dragonfly",
     "expect-test",
     "fallible-iterator", // dependency of `thorin`
     "fastrand",