Skip to content

unix, apple: Switch uses of s! to s2! #5576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tgross35 merged 1 commit into from
Sep 30, 2026
+260 −20
Merged

unix, apple: Switch uses of s! to s2! #5576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/unix/bsd/apple/b32/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::prelude::*;

pub type boolean_t = c_int;

s! {
s2! {
pub struct if_data {
pub ifi_type: c_uchar,
pub ifi_typelen: c_uchar,
Expand Down Expand Up @@ -37,6 +37,7 @@ s! {
ifi_reserved2: Padding<u32>,
}

#[exhaustive] // FIXME(exhaustive): review for 1.0
#[cfg(target_os = "macos")]
pub struct bpf_hdr {
pub bh_tstamp: crate::timeval,
Expand All @@ -50,7 +51,7 @@ s! {
}
}

s_no_extra_traits! {
s_no_extra_traits2! {
#[repr(align(16))]
pub struct max_align_t {
priv_: [f64; 2],
Expand Down
4 changes: 2 additions & 2 deletions src/unix/bsd/apple/b64/aarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ use crate::prelude::*;

pub type boolean_t = c_int;

s! {
s2! {
pub struct malloc_zone_t {
__private: [crate::uintptr_t; 18], // FIXME(macos): needs arm64 auth pointers support
}
}

s_no_extra_traits! {
s_no_extra_traits2! {
pub struct max_align_t {
priv_: f64,
}
Expand Down
4 changes: 2 additions & 2 deletions src/unix/bsd/apple/b64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

use crate::prelude::*;

s! {
#[derive(Default)]
s2! {
pub struct timeval32 {
pub tv_sec: i32,
pub tv_usec: i32,
Expand Down Expand Up @@ -41,6 +40,7 @@ s! {
ifi_reserved2: Padding<u32>,
}

#[exhaustive] // FIXME(exhaustive): review for 1.0
#[cfg(target_os = "macos")]
pub struct bpf_hdr {
pub bh_tstamp: crate::timeval32,
Expand Down
6 changes: 4 additions & 2 deletions src/unix/bsd/apple/b64/x86_64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::prelude::*;

pub type boolean_t = c_uint;

s! {
s2! {
pub struct malloc_introspection_t {
_private: [crate::uintptr_t; 16], // FIXME(macos): keeping private for now
}
Expand Down Expand Up @@ -34,6 +34,7 @@ s! {
) -> *mut c_void,
>,
pub destroy: Option<unsafe extern "C" fn(zone: *mut malloc_zone_t)>,
#[custom_default(ptr::null_mut())]
pub zone_name: *const c_char,
pub batch_malloc: Option<
unsafe extern "C" fn(
Expand All @@ -50,6 +51,7 @@ s! {
num_to_be_freed: c_uint,
),
>,
#[custom_default(ptr::null_mut())]
pub introspect: *mut malloc_introspection_t,
pub version: c_uint,
pub memalign: Option<
Expand All @@ -69,7 +71,7 @@ s! {
}
}

s_no_extra_traits! {
s_no_extra_traits2! {
#[repr(align(16))]
pub struct max_align_t {
priv_: [f64; 2],
Expand Down
Loading
Loading