Skip to content

Commit

Permalink
Auto merge of #107080 - Urgau:cleanup-bootstrap-extra-check-cfgs, r=M…
Browse files Browse the repository at this point in the history
…ark-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).
  • Loading branch information
bors committed Jan 30, 2023
2 parents a2247d8 + ab56c60 commit deb5c38
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
7 changes: 1 addition & 6 deletions std/src/os/fuchsia/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,7 @@ pub type pthread_t = c_ulong;
#[stable(feature = "raw_ext", since = "1.1.0")]
pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};

#[cfg(any(
target_arch = "x86",
target_arch = "le32",
target_arch = "powerpc",
target_arch = "arm"
))]
#[cfg(any(target_arch = "x86", target_arch = "powerpc", target_arch = "arm"))]
mod arch {
use crate::os::raw::{c_long, c_short, c_uint};

Expand Down
1 change: 0 additions & 1 deletion std/src/os/l4re/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};

#[cfg(any(
target_arch = "x86",
target_arch = "le32",
target_arch = "m68k",
target_arch = "powerpc",
target_arch = "sparc",
Expand Down
1 change: 0 additions & 1 deletion std/src/os/linux/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};

#[cfg(any(
target_arch = "x86",
target_arch = "le32",
target_arch = "m68k",
target_arch = "powerpc",
target_arch = "sparc",
Expand Down

0 comments on commit deb5c38

Please sign in to comment.