Skip to content

Commit 0c80ef4

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 0c80ef4

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

src/unix/linux_like/linux/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -6461,6 +6461,3 @@ cfg_if! {
64616461

64626462
mod arch;
64636463
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)