diff options
| author | bors <bors@rust-lang.org> | 2024-01-13 22:05:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-13 22:05:46 +0000 |
| commit | 3deb9bbf84f6431ebcbb7cbdbe3d89bc2636bc1b (patch) | |
| tree | a8e4fa55ce4186137a2ffb2ddcf816ae5ed91e99 /src/tools | |
| parent | d78329b92e8d141d19505e7c1527181c4ab87ed4 (diff) | |
| parent | 847aad75ad7c3a5691a5f45fcf371cc729dbfd77 (diff) | |
| download | rust-3deb9bbf84f6431ebcbb7cbdbe3d89bc2636bc1b.tar.gz rust-3deb9bbf84f6431ebcbb7cbdbe3d89bc2636bc1b.zip | |
Auto merge of #119945 - matthiaskrgr:rollup-oy3e1j2, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #119189 (Move section "Installing from Source" to seperate file) - #119925 (store the segment name when resolution fails) - #119935 (Move personality implementation out of PAL) - #119937 (Improve UEFI target docs) - #119938 (Allow unauthorized users to user the has-merge-commits label) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tidy/src/pal.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs index 398257d2bc2..7e5656926ab 100644 --- a/src/tools/tidy/src/pal.rs +++ b/src/tools/tidy/src/pal.rs @@ -46,8 +46,8 @@ const EXCEPTION_PATHS: &[&str] = &[ // we must use `#[cfg(windows)]` to conditionally compile the // correct `VaList` structure for windows. "library/core/src/ffi/mod.rs", - "library/std/src/sys/pal/", // Platform-specific code for std lives here. - "library/std/src/os", // Platform-specific public interfaces + "library/std/src/sys", // Platform-specific code for std lives here. + "library/std/src/os", // Platform-specific public interfaces // Temporary `std` exceptions // FIXME: platform-specific code should be moved to `sys` "library/std/src/io/copy.rs", |