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 12 pull requests #104836

Closed
wants to merge 25 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ecnelises and others added 25 commits November 22, 2022 14:45
Also do some minor cleanup to insertion of those field names
By using `display: flex`, we still get the never-wrapping layout with
`#crate-search-div` maxing out and truncating its text. The title itself
winds up always filling its parent, but since `#crate-search` doesn't have
`flex-grow` set, it won't fill available space.
…r=petrochenkov

Use node_ty_opt to avoid ICE in visit_ty

Fixes rust-lang#104513
move 2 candidates into builtin candidate

having separate candidates for these isn't too helpful i think

r? types
resolve: Don't use constructor def ids in the map for field names

Also do some minor cleanup to insertion of those field names.

Addresses a FIXME left in rust-lang#103578.
OpaqueCast projections are always overlapping, they can't possibly be disjoint

r? `@lcnr`
…itespace, r=thomcc

Document split{_ascii,}_whitespace() for empty strings

doc change only
… r=oli-obk

make `error_reported` check for delayed bugs

Fixes rust-lang#104768

`error_reported()` was only checking if there were errors emitted, not for `delay_bug`s which can also be a source of `ErrorGuaranteed`. I assume the same is true of `lint_err_count` but i dont know
…nkfelix

Bump the const eval step limit

fixes rust-lang#103814

rust-lang#103877 has too much of an impact to beta backport. So let's just increase the limit, avoiding the immediate breakage.

r? `@pnkfelix`
…itle-display, r=GuillaumeGomez

rustdoc: simplify `.search-results-title` CSS

By using `display: flex`, we still get the never-wrapping layout with `#crate-search-div` maxing out and truncating its text. The title itself winds up always filling its parent, but since `#crate-search` doesn't have `flex-grow` set, it won't fill available space.
…04397, r=oli-obk

lint: do not warn unused parens around higher-ranked function pointers

Fixes rust-lang#104397
…tion_type, r=jackh726

Remove normalize_projection_type

r? `@lcnr`
…ith_query_mode, r=lcnr

with_query_mode -> new

r? ``@lcnr``
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. labels Nov 24, 2022
@rustbot rustbot added the rollup A PR which is a rollup label Nov 24, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=12

@bors
Copy link
Contributor

bors commented Nov 24, 2022

📌 Commit 0fd2585 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 Nov 24, 2022
@bors
Copy link
Contributor

bors commented Nov 24, 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-5qu8hfs (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-5qu8hfs --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_ty_utils/src/instance.rs
Auto-merging compiler/rustc_trait_selection/src/traits/select/mod.rs
Auto-merging compiler/rustc_trait_selection/src/traits/select/confirmation.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/traits/select/confirmation.rs
Auto-merging compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
Auto-merging compiler/rustc_trait_selection/src/traits/project.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/traits/project.rs
Auto-merging compiler/rustc_middle/src/traits/structural_impls.rs
Auto-merging compiler/rustc_middle/src/traits/select.rs
Auto-merging compiler/rustc_middle/src/traits/mod.rs
Auto-merging compiler/rustc_lint/src/unused.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 Nov 24, 2022
@bors
Copy link
Contributor

bors commented Nov 24, 2022

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

@matthiaskrgr matthiaskrgr deleted the rollup-5qu8hfs 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-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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.