Skip to content

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

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

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

Conversation

@nikomatsakis

@nikomatsakisnikomatsakis commented Feb 20, 2018

Copy link
Copy Markdown
Contributor

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

rust-highfive commented Feb 20, 2018

Copy link
Copy Markdown
Contributor

warningWarningwarning

  • 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-highfiverust-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

@Mark-SimulacrumMark-Simulacrum left a comment

Copy link
Copy Markdown
Member

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?

Comment threadsrc/test/run-pass/abort-on-c-abi.rs Outdated

@Mark-SimulacrumMark-SimulacrumFeb 20, 2018

Copy link
Copy Markdown
Member

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

nikomatsakis commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@Mark-Simulacrum done

carols10cents
carols10cents reviewed Feb 21, 2018
View reviewed changes
Comment threadsrc/librustc_mir/build/mod.rs Outdated

@carols10centscarols10centsFeb 21, 2018

Copy link
Copy Markdown
Member

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

@nikomatsakisnikomatsakisFeb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

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

nikomatsakis commented Feb 21, 2018

Copy link
Copy Markdown
ContributorAuthor

@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

rfcbot commented Feb 21, 2018•
edited by nrc
Loading

Copy link
Copy Markdown

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.

@rfcbotrfcbot 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
@nikomatsakisnikomatsakis mentioned this pull request Feb 21, 2018
Merged
@rfcbotrfcbot 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

rfcbot commented Feb 22, 2018

Copy link
Copy Markdown

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

@ashleygwilliams

ashleygwilliams commented Feb 22, 2018

Copy link
Copy Markdown
Contributor

@rfcbot reviewed

@Mark-SimulacrumMark-Simulacrum mentioned this pull request Feb 22, 2018
Merged
@Mark-Simulacrum

Mark-Simulacrum commented Feb 23, 2018

Copy link
Copy Markdown
Member

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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-SimulacrumMark-SimulacrumMark-Simulacrum left review comments
+1 more reviewer
@carols10centscarols10centscarols10cents left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

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