From f9360fb27e60b21cfd824c4a68d2b5df4edb745b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Mar 2025 09:34:08 -0500
Subject: [PATCH] build(deps): bump rustix from 0.38.44 to 1.0.2 (#13071)

* build(deps): bump rustix from 0.38.44 to 1.0.2

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.44 to 1.0.2.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Changelog](https://github.com/bytecodealliance/rustix/blob/main/CHANGES.md)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.44...v1.0.2)

---
updated-dependencies:
- dependency-name: rustix
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Drop unnecessary unsafe blocks for rustix Uid and Gid types

* Revert spurious downgrade of windows-sys

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 Cargo.lock                | 4 ++--
 helix-stdx/Cargo.toml     | 2 +-
 helix-stdx/src/faccess.rs | 4 ++--
 helix-view/Cargo.toml     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2a11634ea..5f8204c2c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1449,7 +1449,7 @@ dependencies = [
  "regex-automata",
  "regex-cursor",
  "ropey",
- "rustix 0.38.44",
+ "rustix 1.0.2",
  "tempfile",
  "unicode-segmentation",
  "which",
@@ -1556,7 +1556,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.44",
+ "rustix 1.0.2",
  "serde",
  "serde_json",
  "slotmap",
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index 0ce6d2493..a41dee839 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -26,7 +26,7 @@ unicode-segmentation.workspace = true
 windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_Security", "Win32_Security_Authorization", "Win32_Storage_FileSystem", "Win32_System_Threading"] }
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.38", features = ["fs"] }
+rustix = { version = "1.0", features = ["fs"] }
 
 [dev-dependencies]
 tempfile.workspace = true
diff --git a/helix-stdx/src/faccess.rs b/helix-stdx/src/faccess.rs
index e4c3daf25..80b668b14 100644
--- a/helix-stdx/src/faccess.rs
+++ b/helix-stdx/src/faccess.rs
@@ -51,8 +51,8 @@ mod imp {
     }
 
     fn chown(p: &Path, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
-        let uid = uid.map(|n| unsafe { rustix::fs::Uid::from_raw(n) });
-        let gid = gid.map(|n| unsafe { rustix::fs::Gid::from_raw(n) });
+        let uid = uid.map(rustix::fs::Uid::from_raw);
+        let gid = gid.map(rustix::fs::Gid::from_raw);
         rustix::fs::chown(p, uid, gid)?;
         Ok(())
     }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 34ceeb91c..ab5dcd07d 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -57,7 +57,7 @@ clipboard-win = { version = "5.4", features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
-rustix = { version = "0.38", features = ["fs"] }
+rustix = { version = "1.0", features = ["fs"] }
 
 [dev-dependencies]
 helix-tui = { path = "../helix-tui" }