Make integer exponentiation methods unstably const #68978
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @cramertj (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
ecstatic-morse
force-pushed
the
const-int-pow
branch
from
69779b5 to
4ce006b
Compare
I believe the previous code was calling `ops::Add::add` instead of the `+` operator to get this behavior.
ecstatic-morse
force-pushed
the
const-int-pow
branch
from
4ce006b to
eadd0cf
Compare
This comment has been minimized.
This comment has been minimized.
ecstatic-morse
force-pushed
the
const-int-pow
branch
from
eadd0cf to
7fe5eaf
Compare
ecstatic-morse
changed the title
|
r? @oli-obk |
|
lgtm, we should remove the macro at some point, but that's not really a problem to leave around until someone discovers it. I also don't know about the panic situation in that function. r=me with @scottmcm 's approval on that panic "change" |
|
I have no horse in this race; I added it because I was asked to do so by @kennytm in #45754 (comment) AFAIK that's just a matter of "use fewer So I think that means |
|
📌 Commit 7fe5eaf has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 20, 2020
…-obk Make integer exponentiation methods unstably const cc rust-lang#53718 This makes the following inherent methods on integer primitives into unstable `const fn`: - `pow` - `checked_pow` - `wrapping_pow` - `overflowing_pow` - `saturating_pow` - `next_power_of_two` - `checked_next_power_of_two` - `wrapping_next_power_of_two` Only two changes were made to the implementation of these methods. First, I had to switch from the `?` operator, which is not yet implemented in a const context, to a `try_opt` macro. Second, `next_power_of_two` was using `ops::Add::add` (see the first commit) to "get overflow checks", so I switched to `#[rustc_inherit_overflow_checks]`. I'm not quite sure why the attribute wasn't used in the first place.
This was referenced Feb 20, 2020
bors
added a commit
that referenced
this pull request
Feb 20, 2020
Rollup of 5 pull requests Successful merges: - #68705 (Add LinkedList::remove()) - #68945 (Stabilize Once::is_completed) - #68978 (Make integer exponentiation methods unstably const) - #69266 (Fix race condition when allocating source files in SourceMap) - #69287 (Clean up E0317 explanation) Failed merges: r? @ghost
59 tasks
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cc #53718
This makes the following inherent methods on integer primitives into unstable
const fn:powchecked_powwrapping_powoverflowing_powsaturating_pownext_power_of_twochecked_next_power_of_twowrapping_next_power_of_twoOnly two changes were made to the implementation of these methods. First, I had to switch from the
?operator, which is not yet implemented in a const context, to atry_optmacro. Second,next_power_of_twowas usingops::Add::add(see the first commit) to "get overflow checks", so I switched to#[rustc_inherit_overflow_checks]. I'm not quite sure why the attribute wasn't used in the first place.