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

Revert #49719 #51417

Merged
merged 1 commit into from
Jun 8, 2018
Merged

Revert #49719 #51417

merged 1 commit into from
Jun 8, 2018

Conversation

pietroalbini
Copy link
Member

This also needs to be backported into beta.

Fixes #51416.
r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 7, 2018
@pietroalbini pietroalbini added beta-nominated Nominated for backporting to the compiler in the beta channel. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 7, 2018
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 7, 2018

📌 Commit 1df7817 has been approved by nikomatsakis

@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 Jun 7, 2018
@pietroalbini
Copy link
Member Author

@bors p=1 (needs to be backported into beta)

kennytm added a commit to kennytm/rust that referenced this pull request Jun 7, 2018
…tsakis

Revert rust-lang#49719

This also needs to be backported into beta.

Fixes rust-lang#51416.
r? @nikomatsakis
bors added a commit that referenced this pull request Jun 7, 2018
Rollup of 9 pull requests

Successful merges:

 - #51186 (Remove two redundant .nll.stderr files)
 - #51283 (Deny #[cfg] and #[cfg_attr] on generic parameters.)
 - #51368 (Fix the use of closures within #[panic_implementation])
 - #51380 (Remove dependency on fmt_macros from typeck)
 - #51389 (rustdoc: Fix missing stability and src links for inlined external macros)
 - #51399 (NLL performance boost)
 - #51407 (Update RLS and Rustfmt)
 - #51417 (Revert #49719)
 - #51420 (Tries to address the recent network issues)

Failed merges:
@bors bors merged commit 1df7817 into rust-lang:master Jun 8, 2018
@pietroalbini pietroalbini deleted the revert-49719 branch June 8, 2018 07:46
@pietroalbini
Copy link
Member Author

Marking this as beta-accepted since the compiler team decided at the last meeting to rollback the change, which is already in beta.

@pietroalbini pietroalbini added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 8, 2018
@kennytm kennytm removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 9, 2018
bors added a commit that referenced this pull request Jun 9, 2018
[beta] Rollup backports

Merged and accepted:

* #51417: Revert #49719
* #51283: Deny #[cfg] and #[cfg_attr] on generic parameters
* #51328: Do not promote union field accesses

r? @ghost
@petrochenkov
Copy link
Contributor

petrochenkov commented Jun 9, 2018

Argh, I'm late and this is merged already.
Given zero regressions we should not (in the past tense) revert #49719, but should rather pass it through a formal FCP and keep the new rules.

bors added a commit that referenced this pull request Jun 16, 2018
Remove `?` macro separator compatibility note from 1.27 release notes

The implementation has been reverted in #51417, so this no longer applies to 1.27.0.

r? @Mark-Simulacrum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants