Remove newer libc changes that aren't necessary anymore

Author: anacrolix

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ permissions:
   contents: read 
 
 env: 
-  MSRV: 1.71.0
+  MSRV: 1.69.0
   # Rust's Loongarch support merged in 1.71.0
   MSRV_LOONGARCH: 1.71.0
   # Minimal Rust version to support all 3 official OpenHarmony targets as tier2

Cargo.toml

@@ -2,9 +2,8 @@
 name        = "nix"
 description = "Rust friendly bindings to *nix APIs"
 edition     = "2021"
-resolver    = "2"
 version     = "0.30.1"
-rust-version = "1.71"
+rust-version = "1.69"
 authors     = ["The nix-rust Project Developers"]
 repository  = "https://github.com/nix-rust/nix"
 license     = "MIT"
@@ -29,6 +28,7 @@ targets = [
 ]
 
 [dependencies]
+libc = { version = "=0.2.172", features = ["extra_traits"] }
 bitflags = "2.3.3"
 cfg-if = "1.0"
 pin-utils = { version = "0.1.0", optional = true }
@@ -72,10 +72,6 @@ uio = []
 user = ["feature"]
 zerocopy = ["fs", "uio"]
 
-[dependencies.libc]
-version = "0.2.172"
-features = ["extra_traits", "const-extern-fn"]
-
 [dev-dependencies]
 assert-impl = "0.1"
 parking_lot = "0.12"

src/sys/epoll.rs

@@ -7,7 +7,7 @@ use std::mem;
 use std::os::unix::io::{AsFd, AsRawFd, FromRawFd, OwnedFd, RawFd};
 
 libc_bitflags!(
-    pub struct EpollFlags: u32 {
+    pub struct EpollFlags: c_int {
         EPOLLIN;
         EPOLLPRI;
         EPOLLOUT;
@@ -63,7 +63,7 @@ impl EpollEvent {
     }
 
     pub fn events(&self) -> EpollFlags {
-        EpollFlags::from_bits(self.event.events as u32).unwrap()
+        EpollFlags::from_bits(self.event.events as c_int).unwrap()
     }
 
     pub const fn data(&self) -> u64 {

src/sys/select.rs

@@ -20,7 +20,10 @@ pub struct FdSet<'fd> {
 }
 
 fn assert_fd_valid(fd: RawFd) {
-    assert!(fd < FD_SETSIZE, "fd must be in the range 0..FD_SETSIZE",);
+    assert!(
+        usize::try_from(fd).map_or(false, |fd| fd < FD_SETSIZE),
+        "fd must be in the range 0..FD_SETSIZE",
+    );
 }
 
 impl<'fd> FdSet<'fd> {
@@ -106,7 +109,7 @@ impl<'fd> FdSet<'fd> {
     pub fn fds(&self, highest: Option<RawFd>) -> Fds<'_, '_> {
         Fds {
             set: self,
-            range: 0..highest.map(|h| h + 1).unwrap_or(FD_SETSIZE) as usize,
+            range: 0..highest.map(|h| h as usize + 1).unwrap_or(FD_SETSIZE),
         }
     }
 }