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

Rename math functions to strict_add/strict_sub (backport #2107) #2110

Merged
merged 2 commits into from
Apr 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 11, 2024

Turns out the Rust standard library add the functions from #2098 under a different name. See rust-lang/rust#118260. Since this was not yet release, we can use those names too.


This is an automatic backport of pull request #2107 done by Mergify.

(cherry picked from commit 3b59561)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Apr 11, 2024
Copy link
Contributor Author

mergify bot commented Apr 11, 2024

Cherry-pick of 3b59561 has failed:

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

You are currently cherry-picking commit 3b59561d5.
  (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
	modified:   packages/std/src/timestamp.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

@webmaster128 webmaster128 merged commit 41b1d16 into release/1.5 Apr 15, 2024
29 checks passed
@webmaster128 webmaster128 deleted the mergify/bp/release/1.5/pr-2107 branch April 15, 2024 07:26
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.

None yet

1 participant