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 PR 70566 for const validation fix #71533

Merged
merged 2 commits into from
Apr 25, 2020

Conversation

pnkfelix
Copy link
Member

This is a port of PR #71441 but ported to the master branch, as discussed in yesterday's T-compiler meeting

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(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 Apr 24, 2020
@pnkfelix
Copy link
Member Author

pnkfelix commented Apr 24, 2020

(I'm planning to r=me this if it passes CI, because @RalfJung is the real author here; I merely cherry-picked their commits somewhat blindly...)

((having said that, I'm also about to go AFK for a while; so if someone else wants to r+ this after it passes CI, be my guest...))

@pnkfelix pnkfelix self-assigned this Apr 24, 2020
@Dylan-DPC-zz
Copy link

@bors r+

@bors
Copy link
Contributor

bors commented Apr 24, 2020

📌 Commit 7d23c3b 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 24, 2020
@RalfJung
Copy link
Member

@jumbatm we are reverting your original PR also on master now, to get #71353 fixed ASAP. Once you did the changes we discussed, we should be able to re-land your original PR.

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71364 (Ignore -Zprofile when building compiler_builtins)
 - rust-lang#71494 (Fix span of while (let) expressions after lowering)
 - rust-lang#71517 ( Quick and dirty fix of the unused_braces lint)
 - rust-lang#71523 (Take a single root node in range_search)
 - rust-lang#71533 (Revert PR 70566 for const validation fix)

Failed merges:

r? @ghost
@davidtwco davidtwco removed their assignment Apr 25, 2020
@bors bors merged commit 4b5b6cb into rust-lang:master Apr 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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