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

Use newly added panicking_add/panicking_sub for Timestamp math (backport #2098) #2103

Merged
merged 7 commits into from
Apr 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 10, 2024


This is an automatic backport of pull request #2098 done by [Mergify](https://mergify.com).

(cherry picked from commit 547efed)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit 242cc1f)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit a74aba0)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit b265b33)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit 198001e)

# Conflicts:
#	CHANGELOG.md
Copy link
Contributor Author

mergify bot commented Apr 10, 2024

Cherry-pick of 547efed has failed:

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

You are currently cherry-picking commit 547efeda0.
  (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

Cherry-pick of 242cc1f has failed:

On branch mergify/bp/release/2.0/pr-2098
Your branch is ahead of 'origin/release/2.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 242cc1ffc.
  (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/timestamp.rs

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

Cherry-pick of a74aba0 has failed:

On branch mergify/bp/release/2.0/pr-2098
Your branch is ahead of 'origin/release/2.0' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a74aba0ef.
  (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

Cherry-pick of b265b33 has failed:

On branch mergify/bp/release/2.0/pr-2098
Your branch is ahead of 'origin/release/2.0' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b265b33c7.
  (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/timestamp.rs

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

Cherry-pick of 198001e has failed:

On branch mergify/bp/release/2.0/pr-2098
Your branch is ahead of 'origin/release/2.0' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 198001e03.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 56edb12 into release/2.0 Apr 10, 2024
29 checks passed
@webmaster128 webmaster128 deleted the mergify/bp/release/2.0/pr-2098 branch April 10, 2024 11:04
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