Skip to content

Commit deb5c38

Browse files
committed
Auto merge of #107080 - Urgau:cleanup-bootstrap-extra-check-cfgs, r=Mark-Simulacrum
bootstrap: cleanup the list of extra check cfgs This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap. - `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos` - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless - `target_arch=le32`: target was removed (rust-lang/rust#45041) - `release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449) - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308) Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
2 parents a2247d8 + ab56c60 commit deb5c38

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

std/src/os/fuchsia/raw.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ pub type pthread_t = c_ulong;
2424
#[stable(feature = "raw_ext", since = "1.1.0")]
2525
pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};
2626

27-
#[cfg(any(
28-
target_arch = "x86",
29-
target_arch = "le32",
30-
target_arch = "powerpc",
31-
target_arch = "arm"
32-
))]
27+
#[cfg(any(target_arch = "x86", target_arch = "powerpc", target_arch = "arm"))]
3328
mod arch {
3429
use crate::os::raw::{c_long, c_short, c_uint};
3530

std/src/os/l4re/raw.rs

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};
2626

2727
#[cfg(any(
2828
target_arch = "x86",
29-
target_arch = "le32",
3029
target_arch = "m68k",
3130
target_arch = "powerpc",
3231
target_arch = "sparc",

std/src/os/linux/raw.rs

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};
2626

2727
#[cfg(any(
2828
target_arch = "x86",
29-
target_arch = "le32",
3029
target_arch = "m68k",
3130
target_arch = "powerpc",
3231
target_arch = "sparc",

0 commit comments

Comments
 (0)