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.

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 8 pull requests #103712

Closed
wants to merge 18 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

reitermarkus and others added 18 commits October 12, 2022 13:01
This wrapper DIV was originally added in
89e1fb3, when it allowed the search bar's
size to be calculated without using `calc()`. This `width` hack can be
removed using flexbox.
spastorino noticed some silly expressions like `item_id.def_id.def_id`.

This commit renames several `def_id: OwnerId` fields as `owner_id`, so
those expressions become `item_id.owner_id.def_id`.

`item_id.owner_id.local_def_id` would be even clearer, but the use of
`def_id` for values of type `LocalDefId` is *very* widespread, so I left
that alone.
…r=oli-obk

Make `CStr::from_ptr` `const`.

Should be included in rust-lang#101719.

cc `@WaffleLapkin`
…, r=compiler-errors

Add test for issue 98634

Fixes rust-lang#98634
Note scope of TAIT more accurately

This maybe explains why the person was confused in rust-lang#101897, since we say "same module" but really should've said "same impl".

r? `@oli-obk`
… r=compiler-errors

Rename some `OwnerId` fields.

`@spastorino` noticed some silly expressions like `item_id.def_id.def_id`.

This commit renames several `def_id: OwnerId` fields as `owner_id`, so those expressions become `item_id.owner_id.def_id`.

`item_id.owner_id.local_def_id` would be even clearer, but the use of `def_id` for values of type `LocalDefId` is *very* widespread, so I left that alone.

r? `@compiler-errors`
…piler-errors

Specialize ToString for Symbol
…er, r=GuillaumeGomez

rustdoc: remove redundant CSS/DOM `div.search-container`

Preview: https://notriddle.com/notriddle-rustdoc-demos/search-container/test_dingus/fn.test.html

This wrapper DIV was originally added in 89e1fb3, when it allowed the search bar's size to be calculated without using `calc()`. This `width` hack can be        removed	using flexbox.
…au,GuillaumeGomez

rustdoc-json-types: Improve ItemSummary::path docs

Somewhat inspired by the doc changes from rust-lang#103085 (cc `@Urgau)`

r? `@GuillaumeGomez`
…mpiler-errors

Add a test for TAIT used with impl/dyn Trait inside RPIT

close rust-lang#101750
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 Oct 29, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Oct 29, 2022

📌 Commit 4c7f49a has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2022
@bors
Copy link
Contributor

bors commented Oct 29, 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-axatn3w (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-axatn3w --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 src/tools/clippy/clippy_lints/src/upper_case_acronyms.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/upper_case_acronyms.rs
Auto-merging src/tools/clippy/clippy_lints/src/unused_self.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/unused_self.rs
Auto-merging src/tools/clippy/clippy_lints/src/types/mod.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/types/mod.rs
Auto-merging src/tools/clippy/clippy_lints/src/return_self_not_must_use.rs
Auto-merging src/tools/clippy/clippy_lints/src/redundant_pub_crate.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/redundant_pub_crate.rs
Auto-merging src/tools/clippy/clippy_lints/src/pass_by_ref_or_value.rs
Auto-merging src/tools/clippy/clippy_lints/src/new_without_default.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/new_without_default.rs
Auto-merging src/tools/clippy/clippy_lints/src/missing_inline.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/missing_inline.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/mod.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/methods/mod.rs
Auto-merging src/tools/clippy/clippy_lints/src/len_zero.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/len_zero.rs
Auto-merging src/tools/clippy/clippy_lints/src/implicit_hasher.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/implicit_hasher.rs
Auto-merging src/tools/clippy/clippy_lints/src/functions/result.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/functions/result.rs
Auto-merging src/tools/clippy/clippy_lints/src/functions/not_unsafe_ptr_arg_deref.rs
Auto-merging src/tools/clippy/clippy_lints/src/functions/must_use.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/functions/must_use.rs
Auto-merging src/tools/clippy/clippy_lints/src/exhaustive_items.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/exhaustive_items.rs
Auto-merging src/tools/clippy/clippy_lints/src/enum_variants.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/enum_variants.rs
Auto-merging src/tools/clippy/clippy_lints/src/doc.rs
Auto-merging src/librustdoc/visit_ast.rs
Auto-merging src/librustdoc/clean/mod.rs
Auto-merging compiler/rustc_save_analysis/src/lib.rs
Auto-merging compiler/rustc_save_analysis/src/dump_visitor.rs
Auto-merging compiler/rustc_privacy/src/lib.rs
CONFLICT (content): Merge conflict in compiler/rustc_privacy/src/lib.rs
Auto-merging compiler/rustc_passes/src/stability.rs
Auto-merging compiler/rustc_passes/src/reachable.rs
CONFLICT (content): Merge conflict in compiler/rustc_passes/src/reachable.rs
Auto-merging compiler/rustc_passes/src/dead.rs
Auto-merging compiler/rustc_metadata/src/rmeta/encoder.rs
Auto-merging compiler/rustc_lint/src/builtin.rs
CONFLICT (content): Merge conflict in compiler/rustc_lint/src/builtin.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 Oct 29, 2022
@bors
Copy link
Contributor

bors commented Oct 29, 2022

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

@matthiaskrgr matthiaskrgr deleted the rollup-axatn3w branch December 22, 2022 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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
Development

Successfully merging this pull request may close these issues.