Rollup of 7 pull requests#143225
Closed
matthiaskrgr wants to merge 15 commits intorust-lang:masterfrom
Closed
Conversation
- Update ui.md - Update type-alias-impl-trait.md - Update README.md
Add an empty `impl ! {}` so `rustdoc` generates auto trait impls and blanket impls on `!`'s documentation page.
`tests/ui`: A New Order [13/N] Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895. r? ``@jieyouxu``
…r=lcnr Use let chains in the new solver Self-explanatory Let chains are stable as of today r? lcnr
…rait, r=workingjubilee inherit `#[align]` from trait method prototypes ``@workingjubilee`` this seems straightforward enough. Now that we're planning to make `-Cmin-function-alignment` a target modifier, I don't think there are any cross-crate complications here? ``@Jules-Bertholet`` is this the behavior you had in mind? In particular the inheritance of the attribute of a default impl is maybe a bit unintuitive at first? (but I think it's ok if that behavior is explicitly documented). r? ghost
fix typos and improve clarity in documentation ``` Description: This pull request corrects minor typos and improves wording for clarity across several documentation files, including: - Correcting instrinsics → intrinsics - Correcting preferrably → preferably - Correcting Orginally → Originally - Correcting resiliant → resilient ```
Add my work email to mailmap
Re-disable `tests/run-make/short-ice` on Windows MSVC again We tried to re-enable this for MSVC in rust-lang#142844. Unfortunately, this test still sometimes fails on Windows MSVC. Tracked in rust-lang#143198. FYI ``@dpaoliello`` (I couldn't reproduce this easily locally either)
Show auto trait and blanket impls for `!`
Add an empty `impl ! {}` so rustdoc shows auto trait impls and blanket impls on `!`'s documentation page.
This is already done for [unit](https://github.com/zachs18/rust/blob/2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2/library/core/src/primitive_docs.rs#L493), [tuples](https://github.com/zachs18/rust/blob/2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2/library/core/src/primitive_docs.rs#L1148), and [`fn` pointers](https://github.com/zachs18/rust/blob/2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2/library/core/src/primitive_docs.rs#L1874).
cc rust-lang#97842 `@notriddle` which added the same for unit and tuple.
<details><summary>Comparison</summary>
[Before (current):](https://doc.rust-lang.org/nightly/std/primitive.never.html)
After:
</details>
`@rustbot` label A-docs F-never_type
rustbot
added
A-attributes
Member
Author
|
@bors r+ rollup=never p=5 |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jun 30, 2025
Rollup of 7 pull requests Successful merges: - #142429 (`tests/ui`: A New Order [13/N]) - #143066 (Use let chains in the new solver) - #143156 (inherit `#[align]` from trait method prototypes) - #143176 (fix typos and improve clarity in documentation) - #143187 (Add my work email to mailmap) - #143199 (Re-disable `tests/run-make/short-ice` on Windows MSVC again) - #143219 (Show auto trait and blanket impls for `!`) r? `@ghost` `@rustbot` modify labels: rollup
Collaborator
Collaborator
|
💥 Test timed out |
bors
added
S-waiting-on-review
Collaborator
Member
|
Why hasn't the next job started yet? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
tests/ui: A New Order [13/N] #142429 (tests/ui: A New Order [13/N])#[align]from trait method prototypes #143156 (inherit#[align]from trait method prototypes)tests/run-make/short-iceon Windows MSVC again #143199 (Re-disabletests/run-make/short-iceon Windows MSVC again)!#143219 (Show auto trait and blanket impls for!)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup