-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rollup of 7 pull requests #102329
Rollup of 7 pull requests #102329
Conversation
This was added in 5101078, to fix the display of the module items and search results tables (see the discussion in rust-lang#86725). Those aren't tables any more. The only remaining table is in docblock, which has its own padding declarations.
This was added in 5101078, to fix the display of the module items and search results tables (see the discussion in rust-lang#86725). Those aren't tables any more. The only remaining table is in docblock, which needs this attribute to look right.
…-unwrap-or-default, r=thomcc Improve code example for Option::unwrap_or_default Fixes rust-lang#100054. Follow-up of rust-lang#102259. r? `@thomcc`
…nion-ident, r=estebank Add a label to struct/enum/union ident name Based on rust-lang#94996 (comment) cc: ``@estebank``
…aumeGomez rustdoc: merge CSS `table` rules into `.docblock` This was added in 5101078, to fix the display of the module items and search results tables (see the discussion in rust-lang#86725). Those aren't tables any more. The only remaining table is in docblock, which has its own padding declarations.
…illaumeGomez Rustdoc-Json: List impls for primitives Closes rust-lang#101695 Partially addresses rust-lang#100961 r? `@GuillaumeGomez`
Document that Display automatically implements ToString Closes rust-lang#92941 r? rust-lang/docs
…=GuillaumeGomez rustdoc: give `.line-number` / `.line-numbers` meaningful names
… r=thomcc rustdoc: Update doc comment for splitn_mut to include mutable in the … The doc comment for [splitn](https://github.com/rust-lang/rust/blob/master/library/core/src/slice/mod.rs#L2051:L2056) is the exact same as the comment for [splitn_mut](https://github.com/rust-lang/rust/blob/master/library/core/src/slice/mod.rs#L2079:L2084). The doc comment for `splitn_mut` should instead say it's working on a mutable subslice.
@bors r+ p=7 |
🔒 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
|
☔ The latest upstream changes (presumably #102324) made this pull request unmergeable. Please resolve the merge conflicts. |
Successful merges:
table
rules into.docblock
#102319 (rustdoc: merge CSStable
rules into.docblock
).line-number
/.line-numbers
meaningful names #102325 (rustdoc: give.line-number
/.line-numbers
meaningful names)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup