Skip to content

Commit

Permalink
Require rust >= 1.40 and drop libc_non_exhaustive conditional
Browse files Browse the repository at this point in the history
[ resolve conflicts - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit d00d1de)
  • Loading branch information
joshtriplett authored and tgross35 committed Nov 17, 2024
1 parent c754031 commit 4558339
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
11 changes: 8 additions & 3 deletions src/unix/linux_like/linux/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,14 @@ 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 {
Expand Down Expand Up @@ -6461,6 +6469,3 @@ cfg_if! {

mod arch;
pub use self::arch::*;

mod non_exhaustive;
pub use self::non_exhaustive::*;
9 changes: 0 additions & 9 deletions src/unix/linux_like/linux/non_exhaustive.rs

This file was deleted.

0 comments on commit 4558339

Please sign in to comment.