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

Merge multiple mutable borrows of immutable binding errors #106284

Merged
merged 2 commits into from
Jan 2, 2023
Merged

Merge multiple mutable borrows of immutable binding errors #106284

merged 2 commits into from
Jan 2, 2023

Conversation

estebank
Copy link
Contributor

Fix #53466.

@rustbot
Copy link
Collaborator

rustbot commented Dec 30, 2022

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added 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. labels Dec 30, 2022
@jyn514
Copy link
Member

jyn514 commented Dec 30, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Dec 30, 2022

📌 Commit 284f011 has been approved by jyn514

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 30, 2022
jyn514 added a commit to jyn514/rust that referenced this pull request Dec 31, 2022
@jyn514
Rollup merge of rust-lang#106284 - estebank:merge-mut-errors, r=jyn514
cf94fb8 
Merge multiple mutable borrows of immutable binding errors

Fix rust-lang#53466.
@jyn514 jyn514 mentioned this pull request Dec 31, 2022
Closed
@compiler-errors compiler-errors mentioned this pull request Dec 31, 2022
Merged
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Dec 31, 2022
@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 Noratrieb mentioned this pull request Dec 31, 2022
Closed
@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 merge-mut-errors (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 merge-mut-errors --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
@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.

@jyn514
Copy link
Member

jyn514 commented Dec 31, 2022

@bors r- rollup=iffy

failed in rollup: #106319 (comment)

@estebank
Copy link
Contributor Author

estebank commented Jan 1, 2023

@bors r=jyn514

@bors
Copy link
Contributor

bors commented Jan 1, 2023

📌 Commit bec18df0dc39c6af2577c331c3f830e4ed8e65c8 has been approved by jyn514

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 1, 2023
@bors
Copy link
Contributor

bors commented Jan 1, 2023

⌛ Testing commit bec18df0dc39c6af2577c331c3f830e4ed8e65c8 with merge c921f2cd56ec44a9adbd7a4e3738457b93c7ce6c...

@bors
Copy link
Contributor

bors commented Jan 1, 2023

💔 Test failed - checks-actions

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

bors commented Jan 1, 2023

⌛ Testing commit 90959b92af13b6d878bd33d982bad504bacd276b with merge 4ec1821e8a530428084b1ec9edb4200d31ee0433...

@rust-log-analyzer

This comment was marked as resolved.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 1, 2023

💔 Test failed - checks-actions

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

estebank commented Jan 2, 2023

@bors r=jyn514

@bors
Copy link
Contributor

bors commented Jan 2, 2023

📌 Commit 7a361698edb54950e6a07c0aacfe545457362b64 has been approved by jyn514

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 Jan 2, 2023
@bors
Copy link
Contributor

bors commented Jan 2, 2023

⌛ Testing commit 7a361698edb54950e6a07c0aacfe545457362b64 with merge a0e155f8ae64aa4604b17a4e6d0d67c3f5a76916...

@bors
Copy link
Contributor

bors commented Jan 2, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 2, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@estebank
Copy link
Contributor Author

estebank commented Jan 2, 2023

@bors r=jyn514

@bors
Copy link
Contributor

bors commented Jan 2, 2023

📌 Commit 5454065 has been approved by jyn514

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 Jan 2, 2023
@bors
Copy link
Contributor

bors commented Jan 2, 2023

⌛ Testing commit 5454065 with merge d5a7ddd...

@bors
Copy link
Contributor

bors commented Jan 2, 2023

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing d5a7ddd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 2, 2023
@bors bors merged commit d5a7ddd into rust-lang:master Jan 2, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 2, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d5a7ddd): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

@estebank estebank deleted the merge-mut-errors branch November 9, 2023 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@TaKO8Ki TaKO8Ki

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.

Multiple errors for the same missing mut
7 participants
@estebank @rustbot @jyn514 @bors @rust-log-analyzer @rust-timer @TaKO8Ki