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

[beta] backport fix for #94502 #94552

Merged
merged 1 commit into from
Mar 7, 2022
Merged

[beta] backport fix for #94502 #94552

merged 1 commit into from
Mar 7, 2022

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Mar 3, 2022

this issue was fixed as part of #93368, so i extracted the change from there

closes #94502

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 3, 2022
@rust-highfive
Copy link
Collaborator

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2022
eddyb
eddyb reviewed Mar 3, 2022
View reviewed changes
src/test/ui/nll/lint-no-err.rs
Comment on lines +1 to +5
// check-pass

// mir borrowck previously incorrectly set `tainted_by_errors`
// when buffering lints, which resulted in ICE later on,
// see #94502.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we would want to land this on nightly as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already planned to do that 😆 #94553

@lcnr lcnr mentioned this pull request Mar 3, 2022
Merged
@oli-obk oli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 3, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Mar 3, 2022

Adding the betanominated label so that triage picks it up today

@oli-obk
Copy link
Contributor

oli-obk commented Mar 3, 2022

@bors r+ (just discussed in compiler team meeting)

@bors
Copy link
Contributor

bors commented Mar 3, 2022

📌 Commit e91cc36bfd02c0ff460c3048838e5e88af5fe24d has been approved by oli-obk

@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 Mar 3, 2022
@oli-obk oli-obk added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 3, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 3, 2022
@matthiaskrgr
Rollup merge of rust-lang#94553 - lcnr:add-tests, r=Dylan-DPC
aaac4f9 
add tests for rust-lang#94502

cc rust-lang#94552
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 4, 2022
Closed
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 5, 2022
Closed
@Dylan-DPC
Copy link
Member

failed on creating the rollup

@bors r-

@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 Mar 5, 2022
@Dylan-DPC
Copy link
Member

@bors r+ rollup=never

(could have been due to the different branch)

@bors
Copy link
Contributor

bors commented Mar 5, 2022

📌 Commit e91cc36bfd02c0ff460c3048838e5e88af5fe24d has been approved by Dylan-DPC

@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 Mar 5, 2022
@Mark-Simulacrum Mark-Simulacrum changed the title backport fix for #94502 [beta] backport fix for #94502 Mar 5, 2022
@Mark-Simulacrum
Copy link
Member

This is beta-targeted and should never be rolled up -- I've updated the title to reflect its target branch.

@bors
Copy link
Contributor

bors commented Mar 5, 2022

⌛ Testing commit e91cc36bfd02c0ff460c3048838e5e88af5fe24d with merge 670ca128d9ee8a63bc6b3a6c169af43a1f8632c3...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Mar 5, 2022

💔 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 Mar 5, 2022
@lcnr
Copy link
Contributor Author

lcnr commented Mar 7, 2022

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Mar 7, 2022

📌 Commit bf76e2ef30841ec73aa2741086c99fb37a0f94bf has been approved by oli-obk

@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 Mar 7, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lcnr
Copy link
Contributor Author

lcnr commented Mar 7, 2022

I don't understand that error 😅

@oli-obk
Copy link
Contributor

oli-obk commented Mar 7, 2022

tidy error: /checkout/src/test/ui/nll/lint-no-err.rs: missing trailing newline

Not sure why the bot didn't extract that

@lcnr
Copy link
Contributor Author

lcnr commented Mar 7, 2022

@bors r=oli-obk

aaah, that's what happens when manually copying file contents without rerunning the tests

@bors
Copy link
Contributor

bors commented Mar 7, 2022

📌 Commit a392f15 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Mar 7, 2022

⌛ Testing commit a392f15 with merge e5effbd...

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 7, 2022
@matthiaskrgr
Rollup merge of rust-lang#94553 - lcnr:add-tests, r=Dylan-DPC
2c98eda 
add tests for rust-lang#94502

cc rust-lang#94552
@bors
Copy link
Contributor

bors commented Mar 7, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e5effbd to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 7, 2022
@bors bors merged commit e5effbd into rust-lang:beta Mar 7, 2022
@rustbot rustbot added this to the 1.60.0 milestone Mar 7, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 14, 2022
@pietroalbini pietroalbini mentioned this pull request Apr 1, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb left review comments

Assignees

@oli-obk oli-obk

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.60.0
Development

Successfully merging this pull request may close these issues.
9 participants
@lcnr @rust-highfive @oli-obk @bors @Dylan-DPC @Mark-Simulacrum @rust-log-analyzer @eddyb @rustbot