Merge pull request #64 from coreos/dependabot/cargo/rustix-1.0

build(deps): update rustix requirement from 0.38 to 1.0

Author: cgwalters

Cargo.toml

@@ -15,7 +15,7 @@ cap-tempfile = "3.2.0"
 cap-primitives = "3"
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.38", features = ["fs", "procfs", "process", "pipe"] }
+rustix = { version = "1.0", features = ["fs", "process", "pipe"] }
 libc = "0.2"
 
 [dev-dependencies]

src/dirext.rs

@@ -351,20 +351,20 @@ fn openat2_with_retry(
 
 fn is_mountpoint_impl_statx(root: &Dir, path: &Path) -> Result<Option<bool>> {
     // https://github.com/systemd/systemd/blob/8fbf0a214e2fe474655b17a4b663122943b55db0/src/basic/mountpoint-util.c#L176
+    use rustix::fs::StatxAttributes;
     use rustix::fs::{AtFlags, StatxFlags};
     use std::os::fd::AsFd;
 
     // SAFETY(unwrap): We can infallibly convert an i32 into a u64.
-    let mountroot_flag: u64 = libc::STATX_ATTR_MOUNT_ROOT.try_into().unwrap();
     match rustix::fs::statx(
         root.as_fd(),
         path,
         AtFlags::NO_AUTOMOUNT | AtFlags::SYMLINK_NOFOLLOW,
         StatxFlags::empty(),
     ) {
         Ok(r) => {
-            let present = (r.stx_attributes_mask & mountroot_flag) > 0;
-            Ok(present.then_some(r.stx_attributes & mountroot_flag > 0))
+            let present = r.stx_attributes_mask.contains(StatxAttributes::MOUNT_ROOT);
+            Ok(present.then_some(r.stx_attributes.contains(StatxAttributes::MOUNT_ROOT)))
         }
         Err(e) if e == rustix::io::Errno::NOSYS => Ok(None),
         Err(e) => Err(e.into()),