Rollup of 7 pull requests#91676
Closed
matthiaskrgr wants to merge 14 commits intorust-lang:masterfrom
Closed
Conversation
…st, r=nagisa suggest casting between i/u32 and char As discussed in rust-lang#91063 , this adds a suggestion for converting between i32/u32 <-> char with `as`, and a short explanation for why this is safe
…macro, r=nagisa Add a suggestion if `macro_rules` is misspelled Fixes rust-lang#91227.
Make rustdoc headings black, and markdown blue Demo: https://rustdoc.crud.net/jsha/heading-color/std/string/index.html#structs https://rustdoc.crud.net/jsha/heading-color/std/string/struct.String.html#examples Fixes rust-lang#91304 r? ``@camelid`` /cc ``@GuillaumeGomez`` (Note: we may want to make rustdoc headings and markdown headings the same color -- rust-lang#90245 -- but we would want to do that intentionally; this is fixing up a change that did so accidentally)
Pretty print break and continue without redundant space
**Repro:**
```rust
macro_rules! m {
($e:expr) => { stringify!($e) };
}
fn main() {
println!("{:?}", m!(loop { break; }));
println!("{:?}", m!(loop { break 'a; }));
println!("{:?}", m!(loop { break false; }));
}
```
**Before:**
- `"loop { break ; }"`
- `"loop { break 'a ; }"`
- `"loop { break false ; }"`
**After:**
- `"loop { break; }"`
- `"loop { break 'a; }"`
- `"loop { break false; }"`
<br>
Notice that `return` and `yield` already follow the same approach as this PR of printing the space *before* each additional piece following the keyword, rather than *after* each thing.
https://github.com/rust-lang/rust/blob/772d51f887fa407216860bf8ecf3f1a32fb795b4/compiler/rustc_ast_pretty/src/pprust/state.rs#L2148-L2154
https://github.com/rust-lang/rust/blob/772d51f887fa407216860bf8ecf3f1a32fb795b4/compiler/rustc_ast_pretty/src/pprust/state.rs#L2221-L2228
…static-morse Add test for packed drops in generators r? ``@ecstatic-morse``
update Miri Fixes rust-lang#91649 r? ``@ghost``
… r=notriddle Fix indent of itemTypes in search.js It has been bugging me for quite some time now. Finally took the time to clean it up a bit. r? ``@notriddle``
Member
Author
|
@bors r+ rollup=never p=7 |
Collaborator
|
📌 Commit 80bae28 has been approved by |
bors
added
the
S-waiting-on-bors
Collaborator
|
🔒 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
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 Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
bors
added
S-waiting-on-author
Member
Author
|
lol what |
Collaborator
|
☔ The latest upstream changes (presumably #91665) made this pull request unmergeable. Please resolve the merge conflicts. |
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
10 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:
macro_rulesis misspelled #91337 (Add a suggestion ifmacro_rulesis misspelled)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup