Skip to content

/rust

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 "skip double negation in const eval" #34497

Merged
merged 1 commit into from Jun 30, 2016

Conversation

Reviewers
No reviews
Assignees

@eddyb eddyb

Labels
beta-accepted
Projects
None yet
Milestone
No milestone
5 participants
@oli-obk @eddyb @bors @alexcrichton @nrc
@oli-obk
Copy link
Contributor

oli-obk commented Jun 27, 2016

This reverts commit 735c018.

fixes #34395

The original commit was based on a mis-understanding of the overflowing literal lint.

This needs to be ported to beta.

r? @eddyb
@oli-obk
Revert "skip double negation in const eval" 
This reverts commit 735c018.
Unverified
The key that signed this is expired.
GPG key ID: 56D6EEA0FC67AC46 Learn about signing commits
Loading status checks…
b8f9c88

@rust-highfive rust-highfive assigned eddyb Jun 27, 2016

@eddyb eddyb added the beta-nominated label Jun 27, 2016

@eddyb

This comment has been minimized.

Sign in to view
Copy link
Member

eddyb commented Jun 27, 2016

@bors r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 27, 2016

📌 Commit b8f9c88 has been approved by eddyb

Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 29, 2016

@Manishearth
Rollup merge of rust-lang#34497 - oli-obk:double_negation, r=eddyb 
Revert "skip double negation in const eval"

This reverts commit 735c018.

fixes rust-lang#34395

The original commit was based on a mis-understanding of the overflowing literal lint.

This needs to be ported to beta.

r? @eddyb
2e893ea

@Manishearth Manishearth referenced this pull request Jun 29, 2016

Merged

Rollup of 11 pull requests #34552

bors added a commit that referenced this pull request Jun 29, 2016

@bors
Auto merge of #34552 - Manishearth:rollup, r=Manishearth 
Rollup of 11 pull requests

- Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542
- Failed merges:
38ac6cc

bors added a commit that referenced this pull request Jun 29, 2016

@bors
Auto merge of #34552 - Manishearth:rollup, r=Manishearth 
Rollup of 11 pull requests

- Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542
- Failed merges:
c6cb5e4

bors added a commit that referenced this pull request Jun 29, 2016

@bors
Auto merge of #34552 - Manishearth:rollup, r=Manishearth 
Rollup of 11 pull requests

- Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542
- Failed merges:
bd5c805

bors added a commit that referenced this pull request Jun 30, 2016

@bors
Auto merge of #34552 - Manishearth:rollup, r=Manishearth 
Rollup of 11 pull requests

- Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542
- Failed merges:
c2b56fb

@bors bors merged commit b8f9c88 into rust-lang:master Jun 30, 2016
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jun 30, 2016

cc @rust-lang/compiler

thoughts on backporting? Would love to include this in the next beta we should produce fairly soon
@nrc

This comment has been minimized.

Sign in to view
Copy link
Member

nrc commented Jul 1, 2016

+1 for packport
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jul 3, 2016

Discussed with compiler team in email as well and sentiment was that this is small enough and important enough to backport, accepting for backport.

@alexcrichton alexcrichton added the beta-accepted label Jul 3, 2016

@alexcrichton alexcrichton referenced this pull request Jul 3, 2016

Merged

Last minute backports to beta #34635

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Jul 3, 2016

Note that to backport this the patch didn't apply cleanly, so I just re-ran git revert 735c018.

@oli-obk would you mind double checking acf3ccd to ensure that it's what's expected?

@alexcrichton alexcrichton removed the beta-nominated label Jul 3, 2016

@oli-obk

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

oli-obk commented Jul 3, 2016

Lgtm, the failure was most likely due to 16bit support missing. There was a conflict during reverting in this pr

@oli-obk oli-obk deleted the oli-obk:double_negation branch Jul 3, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.