Skip to content

Commit 94e3f98

Browse files
committed
cleanup: Use target_vendor = "apple"
The old ctest couldn't handle `target_vendor`, but this is no longer an issue. Simplify the config here.
1 parent 1880ba5 commit 94e3f98

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

src/primitives.rs

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@ pub type c_double = f64;
2020
cfg_if! {
2121
if #[cfg(all(
2222
not(windows),
23-
// FIXME(ctest): just use `target_vendor` = "apple"` once `ctest` supports it
24-
not(any(
25-
target_os = "macos",
26-
target_os = "ios",
27-
target_os = "tvos",
28-
target_os = "watchos",
29-
target_os = "visionos",
30-
)),
23+
not(target_vendor = "apple"),
3124
not(target_os = "vita"),
3225
any(
3326
target_arch = "aarch64",
@@ -91,13 +84,7 @@ pub type uint64_t = u64;
9184
cfg_if! {
9285
if #[cfg(all(
9386
target_arch = "aarch64",
94-
not(any(
95-
target_os = "windows",
96-
target_os = "macos",
97-
target_os = "ios",
98-
target_os = "tvos",
99-
target_os = "watchos"
100-
))
87+
not(any(target_os = "windows", target_vendor = "apple"))
10188
))] {
10289
/// C `__int128` (a GCC extension that's part of many ABIs)
10390
pub type __int128 = i128;
@@ -107,15 +94,7 @@ cfg_if! {
10794
pub type __int128_t = i128;
10895
/// C __uint128_t (alternate name for [__uint128][])
10996
pub type __uint128_t = u128;
110-
} else if #[cfg(all(
111-
target_arch = "aarch64",
112-
any(
113-
target_os = "macos",
114-
target_os = "ios",
115-
target_os = "tvos",
116-
target_os = "watchos"
117-
)
118-
))] {
97+
} else if #[cfg(all(target_arch = "aarch64", target_vendor = "apple"))] {
11998
/// C `__int128_t`
12099
pub type __int128_t = i128;
121100
/// C `__uint128_t`

0 commit comments

Comments
 (0)