Rollup of 6 pull requests #118435

matthiaskrgr · 2023-11-29T03:58:45Z

Successful merges:

Name explicit registers in conflict register errors for inline assembly #117912 (Name explicit registers in conflict register errors for inline assembly)
Add never_patterns feature gate #118157 (Add never_patterns feature gate)
Suggest let or == on typo'd let-chain #118191 (Suggest let or == on typo'd let-chain)
also add is_empty to const raw slices #118231 (also add is_empty to const raw slices)
Pretty print Fn<(..., ...)> trait refs with parentheses (almost) always #118268 (Pretty print Fn<(..., ...)> trait refs with parentheses (almost) always)
Print list of missing target features when calling a function with target features outside an unsafe block #118333 (Print list of missing target features when calling a function with target features outside an unsafe block)

r? @ghost
@rustbot modify labels: rollup

…rget features outside an unsafe block

When encountering a bare assignment in a let-chain, suggest turning the assignment into a `let` expression or an equality check. ``` error: expected expression, found `let` statement --> $DIR/bad-if-let-suggestion.rs:5:8 | LL | if let x = 1 && i = 2 {} | ^^^^^^^^^ | = note: only supported directly in conditions of `if` and `while` expressions help: you might have meant to continue the let-chain | LL | if let x = 1 && let i = 2 {} | +++ help: you might have meant to compare for equality | LL | if let x = 1 && i == 2 {} | + ```

…unction with target features outside an unsafe block

Name explicit registers in conflict register errors for inline assembly

…r=compiler-errors Add `never_patterns` feature gate This PR adds the feature gate and most basic parsing for the experimental `never_patterns` feature. See the tracking issue (rust-lang#118155) for details on the experiment. ``@scottmcm`` has agreed to be my lang-team liaison for this experiment.

…r-errors Suggest `let` or `==` on typo'd let-chain When encountering a bare assignment in a let-chain, suggest turning the assignment into a `let` expression or an equality check. ``` error: expected expression, found `let` statement --> $DIR/bad-if-let-suggestion.rs:5:8 | LL | if let x = 1 && i = 2 {} | ^^^^^^^^^ | = note: only supported directly in conditions of `if` and `while` expressions help: you might have meant to continue the let-chain | LL | if let x = 1 && let i = 2 {} | +++ help: you might have meant to compare for equality | LL | if let x = 1 && i == 2 {} | + ```

…cuviper also add is_empty to const raw slices We have this on mutable raw slices but not const raw slices, which makes little sense. Cc rust-lang#71146

…tebank Pretty print `Fn<(..., ...)>` trait refs with parentheses (almost) always It's almost always better, at least in diagnostics, to print `Fn(i32, u32)` instead of `Fn<(i32, u32)>`. Related to but doesn't fix rust-lang#118225. That needs a separate fix.

…tures, r=est31 Print list of missing target features when calling a function with target features outside an unsafe block Fixes rust-lang#108680 Supersedes rust-lang#109710. I used the same wording for the messages, but the implementation is different. r? ``@est31``

matthiaskrgr · 2023-11-29T03:59:47Z

@bors r+ rollup=never p=6

bors · 2023-11-29T03:59:50Z

📌 Commit e3970cb has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-11-29T11:28:37Z

🔒 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-9xtgmwm (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-9xtgmwm --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 compiler/rustc_lint/src/unused.rs
Auto-merging compiler/rustc_infer/src/infer/error_reporting/mod.rs
CONFLICT (content): Merge conflict in compiler/rustc_infer/src/infer/error_reporting/mod.rs
Auto-merging compiler/rustc_hir/src/hir.rs
Auto-merging compiler/rustc_feature/src/unstable.rs
Auto-merging compiler/rustc_ast_lowering/src/pat.rs
Auto-merging compiler/rustc_ast/src/ast.rs
Automatic merge failed; fix conflicts and then commit the result.

RalfJung and others added 14 commits November 24, 2023 08:25

also add is_empty to const raw slices

a816267

Add print_trait_sugared

a356464

Add more

ecccf33

Print list of missing target features when calling a function with ta…

51ba662

…rget features outside an unsafe block

Name explicit registers in conflict register errors for inline assembly

e0bfb61

thir-unsafeck: print list of missing target features when calling a f…

6b066a9

…unction with target features outside an unsafe block

Add never_patterns feature gate

a3838c8

Rollup merge of rust-lang#117912 - GeorgeWort:master, r=petrochenkov

ed70120

Name explicit registers in conflict register errors for inline assembly

Rollup merge of rust-lang#118231 - RalfJung:const-raw-slice-empty, r=…

4fee90c

…cuviper also add is_empty to const raw slices We have this on mutable raw slices but not const raw slices, which makes little sense. Cc rust-lang#71146

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 Nov 29, 2023

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 Nov 29, 2023

matthiaskrgr closed this Nov 29, 2023

matthiaskrgr deleted the rollup-9xtgmwm branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #118435

Rollup of 6 pull requests #118435

matthiaskrgr commented Nov 29, 2023

matthiaskrgr commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

Rollup of 6 pull requests #118435

Rollup of 6 pull requests #118435

Conversation

matthiaskrgr commented Nov 29, 2023

matthiaskrgr commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023