Skip to content

Commit 5e23131

Browse files
joshtripletttgross35
authored andcommitted
Require rust >= 1.33 and drop libc_packedN conditional
[ resolve conflicts, update to latest - Trevor ] (apply <rust-lang#4060> to `main`) (cherry picked from commit 9dac79f) Changes are reduced in this cherry pick compared to the original commit because some of this was already applied to `main`.
1 parent 6d894f1 commit 5e23131

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/unix/solarish/illumos.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ s! {
4646
}
4747

4848
s_no_extra_traits! {
49-
#[cfg_attr(any(
50-
target_arch = "x86", target_arch = "x86_64"),
51-
repr(packed(4))
52-
)]
49+
#[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), repr(packed(4)))]
5350
pub struct epoll_event {
5451
pub events: u32,
5552
pub u64: u64,

0 commit comments

Comments
 (0)