Rollup of 6 pull requests #131938

matthiaskrgr · 2024-10-19T16:47:42Z

Successful merges:

warn less about non-exhaustive in ffi #116863 (warn less about non-exhaustive in ffi)
Compiletest: Custom differ #131181 (Compiletest: Custom differ)
Add codegen test for branchy bool match #131920 (Add codegen test for branchy bool match)
replace STATX_ALL with (STATX_BASIC_STATS | STATX_BTIME) as former is deprecated #131921 (replace STATX_ALL with (STATX_BASIC_STATS | STATX_BTIME) as former is deprecated)
Warn on redundant --cfg directive when revisions are used #131925 (Warn on redundant --cfg directive when revisions are used)
Remove unnecessary constness from lower_generic_args_of_path #131931 (Remove unnecessary constness from lower_generic_args_of_path)

r? @ghost
@rustbot modify labels: rollup

Bindgen allows generating `#[non_exhaustive] #[repr(u32)]` enums. This results in nonintuitive nonlocal `improper_ctypes` warnings, even when the types are otherwise perfectly valid in C. Adjust for actual tooling expectations by avoiding warning on simple enums with only unit variants.

Extracting this logic into a module makes it easier to write down, and more importantly, later find, the actual decisions we've made.

… deprecated

…ot-ffi-unsafe, r=jieyouxu warn less about non-exhaustive in ffi Bindgen allows generating `#[non_exhaustive] #[repr(u32)]` enums. This results in nonintuitive nonlocal `improper_ctypes` warnings, even when the types are otherwise perfectly valid in C. Adjust for actual tooling expectations by avoiding warning on simple enums with only unit variants. Closes rust-lang#116831

Compiletest: Custom differ This adds support for a custom differ for compiletests. It’s purely visual and helps produce cleaner output when UI tests fail. I’m using an environment variable for now since it’s experimental and I don’t want to drill the cli arguments all the way down. Also did a bit of general cleanup while I was at it. This is how it looks [with debug info silenced](rust-lang#131182) (rust-lang#131182) `COMPILETEST_DIFF_TOOL="/usr/bin/env difft --color always --background light --display side-by-side" ./x test tests/ui/parser` ![image](https://github.com/user-attachments/assets/f740ce50-7564-4469-be0a-86e24bc50eb8)

Add codegen test for branchy bool match Closes rust-lang#108395

replace STATX_ALL with (STATX_BASIC_STATS | STATX_BTIME) as former is deprecated STATX_ALL was deprecated in torvalds/linux@581701b and suggested to use equivalent (STATX_BASIC_STATS | STATX_BTIME) combination, to prevent future surprises.

…r=jieyouxu Warn on redundant `--cfg` directive when revisions are used r? `@jieyouxu` Fixes rust-lang#131390 Not sure of the best way to test this

…=fmease Remove unnecessary constness from `lower_generic_args_of_path` We pass `NotConst` to all callsites of `lower_generic_args_of_path` except for `lower_poly_trait_ref`, so let's not do that.

matthiaskrgr · 2024-10-19T16:48:32Z

@bors r+ rollup=never p=6

bors · 2024-10-19T16:48:34Z

📌 Commit 0ded305 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-10-19T19:59:00Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-x5vifti (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-x5vifti --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/bootstrap/src/utils/change_tracker.rs
CONFLICT (content): Merge conflict in src/bootstrap/src/utils/change_tracker.rs
Auto-merging src/bootstrap/src/core/config/config.rs
CONFLICT (content): Merge conflict in src/bootstrap/src/core/config/config.rs
Auto-merging config.example.toml
CONFLICT (content): Merge conflict in config.example.toml
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-10-19T20:56:58Z

☔ The latest upstream changes (presumably #131934) made this pull request unmergeable. Please resolve the merge conflicts.

workingjubilee and others added 17 commits September 19, 2024 12:56

add an option for a custom differ

501b391

implemented custom differ

a9756d5

update CONFIG_CHANGE_HISTORY

f6b8b49

s/display-diff-tool/compiletest-diff-tool/

af0a680

real default value

0e33163

compiler: Embed consensus in lint::types::improper_ctypes

62aa8f0

Extracting this logic into a module makes it easier to write down, and more importantly, later find, the actual decisions we've made.

Add codegen test for branchy bool match

aa299a9

replace STATX_ALL with (STATX_BASIC_STATS | STATX_BTIME) as former is…

d841146

… deprecated

Warn on redundant --cfg directive when revisions are used

d82a21f

Remove unnecessary constness

ad2a649

Rollup merge of rust-lang#131920 - clubby789:108395-test, r=jieyouxu

1aa97ac

Add codegen test for branchy bool match Closes rust-lang#108395

Rollup merge of rust-lang#131925 - clubby789:redundant-revision-cfg, …

cfe5389

…r=jieyouxu Warn on redundant `--cfg` directive when revisions are used r? `@jieyouxu` Fixes rust-lang#131390 Not sure of the best way to test this

Rollup merge of rust-lang#131931 - compiler-errors:constness-valid, r…

0ded305

…=fmease Remove unnecessary constness from `lower_generic_args_of_path` We pass `NotConst` to all callsites of `lower_generic_args_of_path` except for `lower_poly_trait_ref`, so let's not do that.

bors 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 Oct 19, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 19, 2024

matthiaskrgr closed this Oct 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #131938

Rollup of 6 pull requests #131938

matthiaskrgr commented Oct 19, 2024

matthiaskrgr commented Oct 19, 2024

bors commented Oct 19, 2024

bors commented Oct 19, 2024

bors commented Oct 19, 2024

Rollup of 6 pull requests #131938

Rollup of 6 pull requests #131938

Conversation

matthiaskrgr commented Oct 19, 2024

matthiaskrgr commented Oct 19, 2024

bors commented Oct 19, 2024

bors commented Oct 19, 2024

bors commented Oct 19, 2024