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 4 pull requests #106329

Closed
wants to merge 8 commits into from
Closed

Rollup of 4 pull requests #106329

wants to merge 8 commits into from

Conversation

Noratrieb
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

estebank and others added 8 commits December 29, 2022 22:46
@estebank
Merge multiple mutable borrows of immutable binding errors
284f011 
Fix rust-lang#53466.
@notriddle
rustdoc: merge scrape-help CSS
ac0bb74
@compiler-errors
Suppress errors due to TypeError not coercing with inference variables
f6b45e3
@jyn514
Cleanup mingw-tidy docker job
4822f42 
- Avoid `/checkout/src/ci/run.sh: line 187: [: =: unary operator expected`: https://github.com/rust-lang/rust/actions/runs/3809902408/jobs/6481611301#step:26:1701
- Avoid running `x check` in the tidy test, to get faster feedback. It's
  already run on the normal `mingw-check` job.
@Noratrieb
Rollup merge of rust-lang#106284 - estebank:merge-mut-errors, r=jyn514
315bf58 
Merge multiple mutable borrows of immutable binding errors

Fix rust-lang#53466.
@Noratrieb
Rollup merge of rust-lang#106297 - notriddle:notriddle/scrape-help, r…
8b8d276 
…=GuillaumeGomez

rustdoc: merge scrape-help CSS
@Noratrieb
Rollup merge of rust-lang#106302 - compiler-errors:terr-coerce-w-infe…
abeed83 
…r, r=estebank

Suppress errors due to TypeError not coercing with inference variables

Fixes rust-lang#75331
Fixes rust-lang#68507
Fixes rust-lang#82323

cc `@estebank`
@Noratrieb
Rollup merge of rust-lang#106315 - jyn514:cleanup-mingw-tidy, r=fee1-…
0f50014 
…dead

Cleanup `mingw-tidy` docker job

Fixes a couple small regressions from rust-lang#106048 and rust-lang#105714.

- Avoid `/checkout/src/ci/run.sh: line 187: [: =: unary operator expected`: https://github.com/rust-lang/rust/actions/runs/3809902408/jobs/6481611301#step:26:1701
- Avoid running `x check` in the tidy test, to get faster feedback. It's already run on the normal `mingw-check` job.

r? `@fee1-dead`
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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 Dec 31, 2022
@Noratrieb
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Dec 31, 2022

📌 Commit 0f50014 has been approved by Nilstrieb

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 Dec 31, 2022
@bors
Copy link
Contributor

bors commented Dec 31, 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-p3z9gdr (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-p3z9gdr --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/test/ui/borrowck/mutability-errors.stderr
Auto-merging compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
CONFLICT (content): Merge conflict in compiler/rustc_borrowck/src/diagnostics/mutability_errors.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 Dec 31, 2022
@Noratrieb Noratrieb closed this Dec 31, 2022
@Noratrieb Noratrieb deleted the rollup-p3z9gdr branch December 31, 2022 11:55
@bors
Copy link
Contributor

bors commented Dec 31, 2022

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

@Noratrieb
Copy link
Member Author

wow thank you bors
i guess i should @bors r- it???

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-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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.
7 participants
@Noratrieb @bors @rustbot @estebank @notriddle @compiler-errors @jyn514