Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

uses named fields for RentResullt::CollectRent enum variant (backport #26449) #26534

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2022

This is an automatic backport of pull request #26449 done by Mergify.
Cherry-pick of d7201a8 has failed:

On branch mergify/bp/v1.10/pr-26449
Your branch is up to date with 'origin/v1.10'.

You are currently cherry-picking commit d7201a8d1.
  (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:   runtime/src/accounts.rs
	modified:   runtime/src/accounts_db.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   runtime/src/bank.rs
	deleted by us:   runtime/src/expected_rent_collection.rs
	both modified:   runtime/src/rent_collector.rs

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Avoiding ambiguous raw tuple:
    CollectRent((Epoch, u64))

Using named fields instead:
    CollectRent {
        new_rent_epoch: Epoch,
        rent_due: u64,
    },

(cherry picked from commit d7201a8)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/expected_rent_collection.rs
#	runtime/src/rent_collector.rs
@mergify mergify bot added the conflicts label Jul 10, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 10, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 10, 2022

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 10, 2022
@behzadnouri behzadnouri removed the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2022
@behzadnouri
Copy link
Contributor

already merged as part of:
#26518

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-26449 branch July 10, 2022 15:25
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 10, 2022

automerge label removed due to a CI failure

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant