Skip to content

Commit 9723fba

Browse files
joshtripletttgross35
authored andcommitted
Require rust >= 1.40 and drop libc_non_exhaustive conditional
[ resolve conflicts - Trevor ] (apply <rust-lang#4060> to `main`) (cherry picked from commit d00d1de)
1 parent c754031 commit 9723fba

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

src/unix/linux_like/linux/mod.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,15 @@ s! {
821821
pub val: ::c_int,
822822
}
823823

824+
// linux/openat2.h
825+
#[non_exhaustive]
826+
pub struct open_how {
827+
pub flags: ::__u64,
828+
pub mode: ::__u64,
829+
pub resolve: ::__u64,
830+
}
831+
832+
824833
// linux/sctp.h
825834

826835
pub struct sctp_initmsg {
@@ -6461,6 +6470,3 @@ cfg_if! {
64616470

64626471
mod arch;
64636472
pub use self::arch::*;
6464-
6465-
mod non_exhaustive;
6466-
pub use self::non_exhaustive::*;

src/unix/linux_like/linux/non_exhaustive.rs

-9
This file was deleted.

0 commit comments

Comments
 (0)