Require rust >= 1.40 and drop libc_non_exhaustive conditional

[ resolve conflicts - Trevor ] (apply <rust-lang#4060> to `main`) (cherry picked from commit d00d1de)
tgross35 · Nov 17, 2024 · 9723fba · 9723fba
1 parent c754031
commit 9723fba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -821,6 +821,15 @@ s! {
         pub val: ::c_int,
     }
 
+    // linux/openat2.h
+    #[non_exhaustive]
+    pub struct open_how {
+        pub flags: ::__u64,
+        pub mode: ::__u64,
+        pub resolve: ::__u64,
+    }
+
+
     // linux/sctp.h
 
     pub struct sctp_initmsg {
@@ -6461,6 +6470,3 @@ cfg_if! {
 
 mod arch;
 pub use self::arch::*;
-
-mod non_exhaustive;
-pub use self::non_exhaustive::*;
diff --git a/src/unix/linux_like/linux/non_exhaustive.rs b/src/unix/linux_like/linux/non_exhaustive.rs