Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Rollup of 7 pull requests #102329

Closed
wants to merge 18 commits into from
Closed

Rollup of 7 pull requests #102329

wants to merge 18 commits into from

Conversation

notriddle
Copy link
Contributor

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 18 commits September 26, 2022 12:37
@GuillaumeGomez
Improve code example for Option::unwrap_or_default
475aeab
@TaKO8Ki
create a new local var
a3e2314
@TaKO8Ki
add a label to struct/enum/union ident name
63e5c93
@TaKO8Ki
fix a ui test
9d49d64
@notriddle
rustdoc: remove unneeded CSS td, th { padding 0 }
1fe3ce4 
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.
@notriddle
rustdoc: merge table { border-collapse } into .docblock table`
9990444 
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.
@sigaloid
Document that Display entails ToString
4fad063
@aDotInTheVoid
Rustdoc-Json: List impls for primitives
aac7429 
 Closes rust-lang#101695
@yancyribbens
rustdoc: Update doc comment for splitn_mut to include mutable in the …
40f4044 
…description
@notriddle
rustdoc: give .line-number / .line-numbers meaningful names
0b97831
@notriddle
rustdoc: simplify example-line-numbers CSS selector
9ca2ae3
@notriddle
Rollup merge of rust-lang#102283 - GuillaumeGomez:option-code-example…
e096298 
…-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`
@notriddle
Rollup merge of rust-lang#102314 - TaKO8Ki:add-label-to-struct-enum-u…
c455dac 
…nion-ident, r=estebank

Add a label to struct/enum/union ident name

Based on rust-lang#94996 (comment)
cc: ``@estebank``
@notriddle
Rollup merge of rust-lang#102319 - notriddle:notriddle/td-th, r=Guill…
76e894a 
…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.
@notriddle
Rollup merge of rust-lang#102321 - aDotInTheVoid:rdj-prim-impls, r=Gu…
a97f73c 
…illaumeGomez

 Rustdoc-Json: List impls for primitives

 Closes rust-lang#101695

 Partially addresses rust-lang#100961

r? `@GuillaumeGomez`
@notriddle
Rollup merge of rust-lang#102322 - sigaloid:master, r=GuillaumeGomez
6e8cbe2 
Document that Display automatically implements ToString

Closes rust-lang#92941

r? rust-lang/docs
@notriddle
Rollup merge of rust-lang#102325 - notriddle:notriddle/line-number, r…
cabfddf 
…=GuillaumeGomez

rustdoc: give `.line-number` / `.line-numbers` meaningful names
@notriddle
Rollup merge of rust-lang#102326 - yancyribbens:splin-mut-doc-change,…
5ee831c 
… 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.
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 26, 2022
@notriddle
Copy link
Contributor Author

@bors r+ p=7

@bors
Copy link
Contributor

bors commented Sep 26, 2022

📌 Commit 5ee831c has been approved by notriddle

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 26, 2022
@bors
Copy link
Contributor

bors commented Sep 26, 2022

🔒 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:

  1. git checkout rollup-5xd0itc (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-5xd0itc --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_parse/src/parser/item.rs
CONFLICT (content): Merge conflict in compiler/rustc_parse/src/parser/item.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors 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 Sep 26, 2022
@notriddle notriddle closed this Sep 26, 2022
@bors
Copy link
Contributor

bors commented Sep 26, 2022

☔ The latest upstream changes (presumably #102324) made this pull request unmergeable. Please resolve the merge conflicts.

@notriddle notriddle deleted the rollup-5xd0itc branch September 26, 2022 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-rustdoc-json Area: Rustdoc JSON backend rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@notriddle @bors @rustbot @GuillaumeGomez @TaKO8Ki @sigaloid @aDotInTheVoid @yancyribbens