Rollup of 5 pull requests #96528
Merged
Rollup of 5 pull requests #96528
Conversation
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
…r=jackh726 Ensure that `'_` and GAT yields errors Fixes rust-lang#95305 ```@bors``` r? ```@jackh726```
…davidtwco Migrate ambiguous plus diagnostic to the new derive macro r? ````@davidtwco```` ````@jyn514````
…-lifetime-suggestion, r=jackh726 Recover suggestions to introduce named lifetime under NLL Fixes rust-lang#96157 r? ```@jackh726``` Built on top of rust-lang#96385 so only the second commit is relevant
rustc_ast: Harmonize delimiter naming with `proc_macro::Delimiter` Compiler cannot reuse `proc_macro::Delimiter` directly due to extra impls, but can at least use the same naming. After this PR the only difference between these two enums is that `proc_macro::Delimiter::None` is turned into `token::Delimiter::Invisible`. It's my mistake that the invisible delimiter is called `None` on stable, during the stabilization I audited the naming and wrote the docs, but missed the fact that the `None` naming gives a wrong and confusing impression about what this thing is. cc rust-lang#96421 r? ``@nnethercote``
Fixed grammatical error in example comment Added missing "we" in sentence.
rustbot
added
T-compiler
|
@bors r+ rollup=never p=5 |
|
📌 Commit 2c1d58b has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Apr 28, 2022
|
Finished benchmarking commit (e85edd9): comparison url. Summary:
If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression Footnotes |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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:
'_and GAT yields errors #95312 (Ensure that'_and GAT yields errors)proc_macro::Delimiter#96433 (rustc_ast: Harmonize delimiter naming withproc_macro::Delimiter)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup