Skip to content

Revert rust-lang/rust#46833 on stable#48378

Closed
nikomatsakis wants to merge 1 commit intorust-lang:stablefrom
nikomatsakis:issue-48251-stable
Closed

Revert rust-lang/rust#46833 on stable#48378
nikomatsakis wants to merge 1 commit intorust-lang:stablefrom
nikomatsakis:issue-48251-stable

Conversation

@nikomatsakis
Copy link
Contributor

@nikomatsakis nikomatsakis commented Feb 20, 2018

This is a minimal diff to disable #46833 on stable (due to #48251). I have a more expansive diff for master that allows us to opt back in.

r? @Mark-Simulacrum

@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 20, 2018

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. 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 Feb 20, 2018
This was referenced Feb 20, 2018
Closed
Merged
Mark-Simulacrum
Mark-Simulacrum previously requested changes Feb 20, 2018
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

Could you make the same change for the beta PR?

src/test/run-pass/abort-on-c-abi.rs Outdated
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum Feb 20, 2018

Choose a reason for hiding this comment

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

This syntax appears to not be supported; we have to use // ignore-test instead I think...

@nikomatsakis
Copy link
Contributor Author

nikomatsakis commented Feb 20, 2018

@Mark-Simulacrum done

carols10cents
carols10cents reviewed Feb 21, 2018
View reviewed changes
src/librustc_mir/build/mod.rs Outdated
Copy link
Member

@carols10cents carols10cents Feb 21, 2018

Choose a reason for hiding this comment

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

typo, not a big deal :)

backwardsa

Copy link
Contributor Author

@nikomatsakis nikomatsakis Feb 22, 2018

Choose a reason for hiding this comment

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

are you KIDDING? That is the biggest of deals.

@nikomatsakis nikomatsakis added the T-core Relevant to the core team, which will review and decide on the PR/issue. label Feb 21, 2018
@nikomatsakis
Copy link
Contributor Author

nikomatsakis commented Feb 21, 2018

@rfcbot fcp merge

I propose that we merge this and issue a new point release -- this decision also applies to the beta PR and master PR.

@rfcbot
Copy link

rfcbot commented Feb 21, 2018 •
edited by nrc
Loading

Team member @nikomatsakis has proposed to merge this. The next step is review by the rest of the tagged teams:

No concerns currently listed.

Once a majority of reviewers approve (and none object), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rfcbot rfcbot added the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Feb 21, 2018
@nikomatsakis nikomatsakis mentioned this pull request Feb 21, 2018
Merged
@rfcbot rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Feb 22, 2018
@rfcbot
Copy link

rfcbot commented Feb 22, 2018

🔔 This is now entering its final comment period, as per the review above. 🔔

@ashleygwilliams
Copy link
Contributor

ashleygwilliams commented Feb 22, 2018

@rfcbot reviewed

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 22, 2018
Merged
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Feb 23, 2018

Closing in favor of #48445.

bors added a commit that referenced this pull request Feb 26, 2018
@bors
Auto merge of #48379 - nikomatsakis:issue-48251-beta, r=Mark-Simulacrum
62ad16c 
[beta] temporarily disable #46833 due to #48251

see also #48378

r? @Mark-Simulacrum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

+1 more reviewer

@carols10cents carols10cents carols10cents left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-core Relevant to the core 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.

6 participants

@nikomatsakis @rust-highfive @rfcbot @ashleygwilliams @Mark-Simulacrum @carols10cents