Skip to content

Rollup of 17 pull requests - #161618

Closed
JonathanBrouwer wants to merge 42 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-ERimeRR
Closed

Rollup of 17 pull requests#161618
JonathanBrouwer wants to merge 42 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-ERimeRR

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

blyxyas and others added 30 commits July 2, 2026 17:10
Redundant struct with only one usecase in a single place while keeping
the actual implementation of `Debug` in `CStore` empty.
rust does not emit `byval` here (also not for normal structs) while
clang does.
Resolves FCW in `nix@0.30.1`'s usage of `cfg_aliases`.
The std::sys::os_str::{Buf, Slice} types are only used within the std
crate and not actually exported. Whole `sys` module is private. They
don't need to be public. This might result in a better generated code,
but more importantly it avoids some compile errors down the line.
Firstly, combine functions and results lists into a single list with
'function => result' pairs.  This makes it easier to match function
with its result.

Secondly, eliminate InRange step so that it's easier to notice series
of matches or rejects.

@pacak: I added a variant to test_stress_indices that matches stuff
Otherwise, this will cause `rustc_llvm` build script to consider the
`llvm-config` executable missing, causing cargo build cache
invalidation.
Surprisingly enough there's no rfind tests for multibyte needles, at
least it is possible to break this test without breaking anything other
test.
…argets, r=fmease

add `Complex<T>` layout tests for straightforward targets

tracking issue: rust-lang#154023

Best reviewed commit-by-commit.

This PR does two things

- it updates and enables the CHECK lines for targets where rust already matches the ABI of complex numbers. The original check lines are what `clang` emits. Rust often specifies the same signature slightly differently, but those differences are just cosmetic, e.g. `{ half, half }` versus `[2 x half]`.
- adds some custom logic for complex numbers on `s390x`, so that they match `clang` and `gcc` for that target.

I've validated this extensively with `abi-cafe`. But also, this is just locking in the status-quo for an unstable feature. So, I'm not really looking for someone to pore over every line of the diff, just a coarse scan to see if anything odd jumps out. We have automated ways of checking that our logic is actually correct.
…rgau

Put back `tests/rustdoc-gui/search-result-display.goml`

Fixes rust-lang#152197.

I updated the test I added back in the first commit to remove some potential flaky issues.

The second commit is just a cleanup to reuse the same function to wait for the search results. Like that we only need to change it in one place if we update this.

r? @Urgau
core: refactor tests/pattern.rs tests

Firstly, combine functions and results lists into a single list with `'function => result' `pairs.  This makes it easier to match function with its result.

Secondly, eliminate `InRange` step so that it's easier to notice series of matches or rejects.

I also added a variant to `test_stress_indices` that matches stuff with `|_| true` which wasn't covered.

This commit is extracted from rust-lang#160971
…rgau

Fix flakyness issue for `tests/rustdoc-gui/headers-color.goml`

r? @jieyouxu
re-bless `pretty-std` on windows

Corrects a small error from rust-lang#160331. I forgot CI doesn't run lldb on windows, so it didn't catch that these hadn't been updated.

At the very least though, this lets us see, in isolation, what a typical diff will look like for the json data.

r? @Kobzol @jieyouxu
update eyre

This fixes some future-compat warnings in ui_test.
(The warnings show up in a different crate due to macros being involved.)
std: reduce visibility of some internal OsStr related types

The std::sys::os_str::{Buf, Slice} types are only used within the std crate and not actually exported. Whole `sys` module is private. They don't need to be public. This might result in a better generated code, but more importantly it avoids some compile errors down the line.

This commit is extracted from rust-lang#160971
…-llvm-config, r=Kobzol

[Bootstrap] Pass exact CI `llvm-config` executable path

## Summary

Follow-up fix for rust-lang#160916.

I noticed that against latest `main` we are repeatedly invalidating `rustc_llvm`'s build script after

```
       Fresh ar_archive_writer v0.5.3
       Dirty rustc_llvm v0.0.0 (X:\repos\rust\compiler\rustc_llvm): the file `build\x86_64-pc-windows-msvc\ci-llvm\bin\llvm-config` is missing
   Compiling rustc_llvm v0.0.0 (X:\repos\rust\compiler\rustc_llvm)
       Fresh unicode-security **v0.1.2**
```

This PR passes the *exact* CI LLVM `llvm-config` executable path (including the `.exe` extension on Windows). Otherwise, this will cause `rustc_llvm` build script to consider the `llvm-config` executable missing, causing cargo build cache invalidation.

I tested this locally and this seems to fix the invalidation w/ CI LLVM.

r? Kobzol
Path: use optimized is_empty() method

A simple change: use the new `Path::is_empty` method, that directly checks if the inner `OsStr` is empty instead of allocating a new `Path` and doing `Path` equality.
coretests: Add a few tests for backward multibyte predicate

Surprisingly enough there's no rfind tests for multibyte needles, at least it is possible to break this test without breaking anything other test.

This commit is extracted from rust-lang#160971
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 23, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 23, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple-1,aarch64-apple-2,x86_64-mingw-1,i686-msvc-1,i686-msvc-2

@rust-bors

rust-bors Bot commented Aug 23, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 2897969 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 23, 2026
Rollup of 17 pull requests


try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple-1
try-job: aarch64-apple-2
try-job: x86_64-mingw-1
try-job: i686-msvc-1
try-job: i686-msvc-2
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 23, 2026
…uwer

Rollup of 17 pull requests

Successful merges:

 - #161187 (add `Complex<T>` layout tests for straightforward targets)
 - #161524 (Put back `tests/rustdoc-gui/search-result-display.goml`)
 - #161592 (core: refactor tests/pattern.rs tests)
 - #161602 (Fix flakyness issue for `tests/rustdoc-gui/headers-color.goml`)
 - #155254 (Recover on attribute in use tree)
 - #158695 (Replace `CrateDump` with the Debug impl from `CStore`)
 - #159456 (Fix the reporting of layout normalization failures in transmute checks)
 - #160452 (-Ctarget-feature is not unsafe (any more))
 - #161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios")
 - #161166 (add crashtests [5/N], remove unused aux files )
 - #161569 (Bump cfg_aliases to 0.2.2)
 - #161573 (re-bless `pretty-std` on windows)
 - #161588 (update eyre)
 - #161589 (std: reduce visibility of some internal OsStr related types)
 - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
 - #161601 (Path: use optimized is_empty() method)
 - #161604 (coretests: Add a few tests for backward multibyte predicate)
@rust-bors

rust-bors Bot commented Aug 23, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 5d8c189 (5d8c1898c35e7b0b740a705820d4497964eef937)
Base parent: 9a4ad59 (9a4ad59ae3073b013cd62f53f8349ddc61a012e8)

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-gnu failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 23, 2026
@rust-bors

rust-bors Bot commented Aug 23, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 6ee39b5 failed: CI. Failed job:

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 24, 2026
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 24, 2026
@rust-bors

rust-bors Bot commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.