Skip to content

Commit

Permalink
Require rust >= 1.33 and drop libc_packedN conditional
Browse files Browse the repository at this point in the history
[ 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`.
  • Loading branch information
joshtriplett authored and tgross35 committed Nov 17, 2024
1 parent 6d894f1 commit 5e23131
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/unix/solarish/illumos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ s! {
}

s_no_extra_traits! {
#[cfg_attr(any(
target_arch = "x86", target_arch = "x86_64"),
repr(packed(4))
)]
#[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), repr(packed(4)))]
pub struct epoll_event {
pub events: u32,
pub u64: u64,
Expand Down

0 comments on commit 5e23131

Please sign in to comment.