Skip to content

Commit 770bf31

Browse files
authored
Rollup merge of #83877 - jyn514:exceptions, r=Mark-Simulacrum
Remove unnecessary exceptions to the platform-specific code check Some of these were just wrong, like src/librustc. Some looked outdated, like std::f64. Not sure what was going on with the others - maybe this check isn't as smart as it needs to be? But in the meantime it seems silly to ignore the check if it will pass anyway.
2 parents 49b178e + 9eabb41 commit 770bf31

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

src/tools/tidy/src/pal.rs

-22
Original file line numberDiff line numberDiff line change
@@ -40,35 +40,20 @@ const EXCEPTION_PATHS: &[&str] = &[
4040
"library/panic_abort",
4141
"library/panic_unwind",
4242
"library/unwind",
43-
// black_box implementation is LLVM-version specific and it uses
44-
// target_os to tell targets with different LLVM-versions apart
45-
// (e.g. `wasm32-unknown-emscripten` vs `wasm32-unknown-unknown`):
46-
"library/core/src/hint.rs",
4743
"library/std/src/sys/", // Platform-specific code for std lives here.
4844
// This has the trailing slash so that sys_common is not excepted.
4945
"library/std/src/os", // Platform-specific public interfaces
5046
"library/rtstartup", // Not sure what to do about this. magic stuff for mingw
51-
// temporary exceptions
52-
"library/std/src/lib.rs",
53-
"library/std/src/path.rs",
54-
"library/std/src/f32.rs",
55-
"library/std/src/f64.rs",
5647
// Integration test for platform-specific run-time feature detection:
5748
"library/std/tests/run-time-detect.rs",
5849
"library/std/src/net/test.rs",
5950
"library/std/src/net/addr",
6051
"library/std/src/net/udp",
61-
"library/std/src/sys_common/mod.rs",
62-
"library/std/src/sys_common/net.rs",
63-
"library/std/src/sys_common/backtrace.rs",
6452
"library/std/src/sys_common/remutex.rs",
6553
"library/std/src/sync/mutex.rs",
6654
"library/std/src/sync/rwlock.rs",
67-
// panic_unwind shims
68-
"library/std/src/panicking.rs",
6955
"library/term", // Not sure how to make this crate portable, but test crate needs it.
7056
"library/test", // Probably should defer to unstable `std::sys` APIs.
71-
"library/std/src/sync/mpsc", // some tests are only run on non-emscripten
7257
// std testing crates, okay for now at least
7358
"library/core/tests",
7459
"library/alloc/tests/lib.rs",
@@ -79,13 +64,6 @@ const EXCEPTION_PATHS: &[&str] = &[
7964
// we must use `#[cfg(windows)]` to conditionally compile the
8065
// correct `VaList` structure for windows.
8166
"library/core/src/ffi.rs",
82-
// non-std crates
83-
"src/test",
84-
"src/tools",
85-
"src/librustc",
86-
"src/librustdoc",
87-
"src/librustc_ast",
88-
"src/bootstrap",
8967
];
9068

9169
pub fn check(path: &Path, bad: &mut bool) {

0 commit comments

Comments
 (0)