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

Implement add for Uint* more consistently (backport #2092) #2096

Merged
merged 1 commit into from
Apr 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 9, 2024

  • Streamline implementation for references by using forward_ref_binop!
  • use better error panic message for overflows for Uint64/Uint512 (before "called Option::unwrap() on a None value")
    This is an automatic backport of pull request Implement add for Uint* more consistently #2092 done by Mergify.

@mergify mergify bot added the conflicts label Apr 9, 2024
Copy link
Contributor Author

mergify bot commented Apr 9, 2024

Cherry-pick of 80b6ba7 has failed:

On branch mergify/bp/release/1.5/pr-2092
Your branch is up to date with 'origin/release/1.5'.

You are currently cherry-picking commit 80b6ba7b3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packages/std/src/math/uint128.rs
	modified:   packages/std/src/math/uint256.rs
	modified:   packages/std/src/math/uint512.rs
	modified:   packages/std/src/math/uint64.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

(cherry picked from commit 80b6ba7)

# Conflicts:
#	CHANGELOG.md
@webmaster128 webmaster128 force-pushed the mergify/bp/release/1.5/pr-2092 branch from 7101633 to a39a171 Compare April 9, 2024 15:12
@webmaster128 webmaster128 merged commit 98d37d7 into release/1.5 Apr 9, 2024
29 checks passed
@webmaster128 webmaster128 deleted the mergify/bp/release/1.5/pr-2092 branch April 9, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant