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

Revert PR 81473 to resolve (on mainline) issues 81626 and 81658. #86212

Merged
merged 3 commits into from
Jul 22, 2021
Merged

Revert PR 81473 to resolve (on mainline) issues 81626 and 81658. #86212

merged 3 commits into from
Jul 22, 2021

Conversation

pnkfelix
Copy link
Member

This is a nightly-targetted variant of PR #83171

The intent is to just address issue #81658 on all release channels, rather that keep repeatedly reverting PR #83171 on beta.

However, our intent is also to reland PR #83171 after we have addressed issue #81658 , most likely by coupling the re-landing of PR #83171 with an enhancement like PR #83004

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 11, 2021
@pnkfelix pnkfelix added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 11, 2021
@pnkfelix pnkfelix mentioned this pull request Jun 11, 2021
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member

r=me but looks like there's CI trouble here, and presumably we'll need another backport as this unfortunately didn't land in time for 1.54 branching

@Mark-Simulacrum Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 21, 2021
@JohnCSimon
Copy link
Member

Triage:
@pnkfelix CI trouble here, FYI.

@pietroalbini pietroalbini added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 17, 2021
@pietroalbini
Copy link
Member

Beta-nominated for 1.54, as this will land in 1.55.

@bors
Copy link
Contributor

bors commented Jul 18, 2021

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

@pnkfelix
Copy link
Member Author

Hmm. Do I delete the unused method, or just #[allow(dead_code)] there. I am tempted to do the latter, since it should be less disruptive in case other people have injected uses of it...?

@pnkfelix
Revert PR 81473 to resolve (on mainline) issues 81626 and 81658.
cf337d1 
Revert "Add missing brace"

This reverts commit 85ad773.

Revert "Simplify base_expr"

This reverts commit 899aae4.

Revert "Warn write-only fields"

This reverts commit d3c69a4.
@pnkfelix
Allow some temporarily dead code.
b6e9d06 
I expect these two methods to come back very soon; noise of removing them to satisfy lint seems wrong.
@pnkfelix pnkfelix force-pushed the mainline-targetted-revert-81473-warn-write-only-fields branch from 7ae061c to b6e9d06 Compare July 22, 2021 02:57
@pnkfelix
Copy link
Member Author

@bors r=simulacrum

also, unilaterally approving for beta backport.

@bors
Copy link
Contributor

bors commented Jul 22, 2021

📌 Commit ee2bb1f has been approved by simulacrum

@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 Jul 22, 2021
@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 22, 2021
@pnkfelix pnkfelix mentioned this pull request Jul 22, 2021
Merged
@Mark-Simulacrum
Copy link
Member

@bors p=1

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 22, 2021
@bors
Copy link
Contributor

bors commented Jul 22, 2021

⌛ Testing commit ee2bb1f with merge 0271870...

@bors
Copy link
Contributor

bors commented Jul 22, 2021

☀️ Test successful - checks-actions
Approved by: simulacrum
Pushing 0271870 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 22, 2021
@bors bors merged commit 0271870 into rust-lang:master Jul 22, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 22, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2021
@bors
Auto merge of rust-lang#87369 - pnkfelix:beta-targetted-revert-81473-…
b959328 
…warn-write-only-fields, r=Mark-Simulacrum

Beta targetted revert 81473 warn write only fields

beta backport of PR rust-lang#86212
@Enselic Enselic mentioned this pull request Aug 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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.55.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@pnkfelix @rust-highfive @rust-log-analyzer @Mark-Simulacrum @JohnCSimon @pietroalbini @bors @rustbot