-
Notifications
You must be signed in to change notification settings - Fork 13k
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
Rollup of 8 pull requests #103712
Conversation
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
@bors r+ rollup=never p=8 |
🔒 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 #102233) made this pull request unmergeable. Please resolve the merge conflicts. |
Successful merges:
CStr::from_ptr
const
. #102961 (MakeCStr::from_ptr
const
.)OwnerId
fields. #103618 (Rename someOwnerId
fields.)div.search-container
#103663 (rustdoc: remove redundant CSS/DOMdiv.search-container
)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup