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

Also remove const-hack for abs #67845

Merged
merged 1 commit into from
Jan 5, 2020
Merged

Conversation

jumbatm
Copy link
Contributor

@jumbatm jumbatm commented Jan 3, 2020

Closes #67842.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Jan 3, 2020

cc @RalfJung @Centril

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Jan 3, 2020

📌 Commit ae002c1 has been approved by oli-obk

@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 Jan 3, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 3, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 4, 2020
bors added a commit that referenced this pull request Jan 4, 2020
Rollup of 8 pull requests

Successful merges:

 - #66913 (Suggest calling method when first argument is `self`)
 - #67531 (no longer promote non-pattern const functions)
 - #67773 (Add a test for #37333)
 - #67786 (Nix reexports from `rustc_span` in `syntax`)
 - #67789 (Cleanup linkchecker whitelist)
 - #67810 (Implement uncommon_codepoints lint.)
 - #67835 (tweak wording of mismatched delimiter errors)
 - #67845 (Also remove const-hack for abs)

Failed merges:

r? @ghost
src/libcore/num/mod.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Jan 4, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 4, 2020

📌 Commit cc2044641d59b81f17fbff9934da769066208a7d has been approved by oli-obk

@jumbatm jumbatm closed this Jan 4, 2020
@jumbatm jumbatm deleted the also-unconst-hack-abs branch January 4, 2020 18:25
@jumbatm jumbatm restored the also-unconst-hack-abs branch January 4, 2020 18:32
@jumbatm jumbatm deleted the also-unconst-hack-abs branch January 4, 2020 18:33
@tspiteri
Copy link
Contributor

tspiteri commented Jan 4, 2020

@jumbatm Why was this PR closed? It seems that while the first commit was merged in the "Rollup of 8 pull requests", the second commit was not merged.

@jumbatm
Copy link
Contributor Author

jumbatm commented Jan 4, 2020

Ah, I see. It closed when I pushed a delete branch to my fork, sorry!

@jumbatm jumbatm restored the also-unconst-hack-abs branch January 4, 2020 20:17
@tspiteri
Copy link
Contributor

tspiteri commented Jan 4, 2020

@oli-obk Does this PR need to be reopened and r+ed once again?

@oli-obk oli-obk reopened this Jan 4, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Jan 4, 2020

Please rebase over master so we see what is unmerged so far

@jumbatm
Copy link
Contributor Author

jumbatm commented Jan 4, 2020

Done

@oli-obk
Copy link
Contributor

oli-obk commented Jan 5, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 5, 2020

📌 Commit 525cd2d has been approved by oli-obk

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 5, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 5, 2020
bors added a commit that referenced this pull request Jan 5, 2020
Rollup of 5 pull requests

Successful merges:

 - #67818 (rustdoc: Avoid panic when parsing codeblocks for playground links)
 - #67845 (Also remove const-hack for abs)
 - #67879 (Remove negative number check from float sqrt)
 - #67881 (Add backticks to various diagnostics)
 - #67882 (remove bespoke flock bindings)

Failed merges:

r? @ghost
@bors bors merged commit 525cd2d into rust-lang:master Jan 5, 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.

abs function still not cleaned up from const_hack
6 participants