This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
Remove Copy from Ensure* traits
#13043
Merged
Conversation
This file contains 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
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
ggwpez
added
A0-please_review
ggwpez
added
A3-in_progress
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
github-actions
bot
added
A0-please_review
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
lemunozm
reviewed
Jan 2, 2023
| @@ -728,14 +725,13 @@ mod ensure { | |||
| /// assert_eq!(underflow(), Err(ArithmeticError::Underflow)); | |||
| /// ``` | |||
| fn ensure_from(other: T) -> Result<Self, ArithmeticError> { | |||
| Self::try_from(other).map_err(|_| error::equivalent(other)) | |||
| let err = error::equivalent(&other); | |||
There was a problem hiding this comment.
Regarding the performance of this, it seems like the assembly resulting code of this can be easily reordered by the compiler and should not be penalty
There was a problem hiding this comment.
Not empirically (not sure how to do it well).
To extend my argument, error::equivalent has no side effects, and if the resulting value is only read under a condition, the compiler can only execute that for that condition. I understand that this works for any T that is not really consumed by the try_from(), which means that T is in fact a Copy type. The compiler could not optimize this if T is not Copy.
Co-authored-by: Luis Enrique Muñoz Martín <lemunozm@gmail.com> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
bkchr
approved these changes
Jan 2, 2023
ruseinov
approved these changes
Jan 4, 2023
|
bot merge |
ltfschoen
pushed a commit
to ltfschoen/substrate
that referenced
this pull request
Feb 22, 2023
* Remove Copy from EnsureOp and EnsureOpAssign Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove Copy from EnsureFrom and EnsureInto Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix default impl Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Reuse assignment code in Ensure trait Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Require Ensure for all BaseArithmetic types Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix assign impls Co-authored-by: Luis Enrique Muñoz Martín <lemunozm@gmail.com> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add success doc tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
ark0f
pushed a commit
to gear-tech/substrate
that referenced
this pull request
Feb 27, 2023
* Remove Copy from EnsureOp and EnsureOpAssign Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove Copy from EnsureFrom and EnsureInto Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix default impl Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Reuse assignment code in Ensure trait Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Require Ensure for all BaseArithmetic types Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix assign impls Co-authored-by: Luis Enrique Muñoz Martín <lemunozm@gmail.com> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add success doc tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Follow up on #12967 (comment) to make
BaseArithmeticwork withEnsure.It re-uses the code from
EnsureOpAssigninEnsureOp, instead of the other way around, which incurred theCopyrequirement.It does contain an artificial dependence of
EnsureOponEnsureOpAssignto re-use code, but that should be fine since the trait bounds would be the same anyway.Removes the
Copyrequirement from:EnsureOpandEnsureOpAssignEnsureFromandEnsureInto: Not sure about this one since we now generate the error in every case. Could be slightly slower.EnsureforBaseArithmeticcc @lemunozm