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

Fix Nightly Clippy Warnings (backport #18065) #18070

Merged
merged 4 commits into from
Jun 18, 2021
Merged

Fix Nightly Clippy Warnings (backport #18065) #18070

merged 4 commits into from
Jun 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 18, 2021

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

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

You are currently cherry-picking commit 6514096a6.
  (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:   account-decoder/src/lib.rs
	modified:   account-decoder/src/parse_config.rs
	modified:   accounts-cluster-bench/src/main.rs
	modified:   banking-bench/src/main.rs
	modified:   banks-client/src/lib.rs
	modified:   banks-server/src/banks_server.rs
	modified:   banks-server/src/send_transaction_service.rs
	modified:   bench-exchange/src/bench.rs
	modified:   bench-streamer/src/main.rs
	modified:   bench-tps/src/bench.rs
	modified:   bench-tps/src/main.rs
	modified:   clap-utils/src/keypair.rs
	modified:   cli-config/src/config.rs
	modified:   cli-output/src/cli_output.rs
	modified:   cli/src/cli.rs
	modified:   cli/src/cluster_query.rs
	modified:   cli/src/inflation.rs
	modified:   cli/src/main.rs
	modified:   cli/src/nonce.rs
	modified:   cli/src/program.rs
	modified:   cli/src/spend_utils.rs
	modified:   cli/src/stake.rs
	modified:   cli/src/validator_info.rs
	modified:   cli/src/vote.rs
	modified:   cli/tests/program.rs
	modified:   client/src/rpc_cache.rs
	modified:   client/src/rpc_client.rs
	modified:   client/src/thin_client.rs
	modified:   client/src/tpu_client.rs
	modified:   core/benches/banking_stage.rs
	modified:   core/benches/consensus.rs
	modified:   core/src/accounts_hash_verifier.rs
	modified:   core/src/broadcast_stage.rs
	modified:   core/src/broadcast_stage/broadcast_duplicates_run.rs
	modified:   core/src/broadcast_stage/standard_broadcast_run.rs
	modified:   core/src/cluster_info_vote_listener.rs
	modified:   core/src/cluster_slot_state_verifier.rs
	modified:   core/src/commitment_service.rs
	modified:   core/src/consensus.rs
	modified:   core/src/fetch_stage.rs
	modified:   core/src/heaviest_subtree_fork_choice.rs
	modified:   core/src/ledger_cleanup_service.rs
	modified:   core/src/optimistic_confirmation_verifier.rs
	modified:   core/src/progress_map.rs
	modified:   core/src/repair_service.rs
	modified:   core/src/repair_weight.rs
	modified:   core/src/repair_weighted_traversal.rs
	modified:   core/src/serve_repair.rs
	modified:   core/src/serve_repair_service.rs
	modified:   core/src/shred_fetch_stage.rs
	modified:   core/src/tpu.rs
	modified:   core/src/unfrozen_gossip_verified_vote_hashes.rs
	modified:   core/src/validator.rs
	modified:   core/src/window_service.rs
	modified:   core/tests/fork-selection.rs
	modified:   core/tests/snapshots.rs
	modified:   dos/src/main.rs
	modified:   faucet/src/faucet.rs
	modified:   faucet/tests/local-faucet.rs
	modified:   frozen-abi/macro/src/lib.rs
	modified:   frozen-abi/src/abi_example.rs
	modified:   genesis-utils/src/lib.rs
	modified:   genesis/src/genesis_accounts.rs
	modified:   genesis/src/main.rs
	modified:   gossip/src/cluster_info.rs
	modified:   gossip/src/contact_info.rs
	modified:   gossip/src/crds_gossip.rs
	modified:   gossip/src/crds_gossip_push.rs
	modified:   gossip/src/crds_value.rs
	modified:   gossip/src/gossip_service.rs
	modified:   gossip/src/main.rs
	modified:   gossip/tests/crds_gossip.rs
	modified:   install/src/command.rs
	modified:   install/src/lib.rs
	modified:   keygen/src/keygen.rs
	modified:   ledger-tool/src/bigtable.rs
	modified:   ledger-tool/tests/basic.rs
	modified:   ledger/src/bank_forks_utils.rs
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   ledger/src/entry.rs
	modified:   ledger/src/leader_schedule_utils.rs
	modified:   ledger/src/poh.rs
	modified:   ledger/src/shred.rs
	modified:   ledger/src/sigverify_shreds.rs
	modified:   local-cluster/src/cluster_tests.rs
	modified:   local-cluster/src/local_cluster.rs
	modified:   local-cluster/tests/local_cluster.rs
	modified:   measure/src/measure.rs
	modified:   metrics/src/counter.rs
	modified:   perf/src/packet.rs
	modified:   perf/src/sigverify.rs
	modified:   poh/benches/poh_verify.rs
	modified:   poh/src/poh_recorder.rs
	modified:   program-test/src/lib.rs
	modified:   programs/bpf_loader/benches/serialization.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   programs/bpf_loader/src/serialization.rs
	modified:   programs/bpf_loader/src/syscalls.rs
	modified:   programs/config/src/config_processor.rs
	modified:   programs/config/src/date_instruction.rs
	modified:   programs/exchange/src/exchange_processor.rs
	modified:   programs/ownable/src/ownable_instruction.rs
	modified:   programs/ownable/src/ownable_processor.rs
	modified:   programs/stake/src/config.rs
	modified:   programs/stake/src/stake_instruction.rs
	modified:   programs/stake/src/stake_state.rs
	modified:   programs/vote/src/vote_state/mod.rs
	modified:   programs/vote/src/vote_transaction.rs
	modified:   remote-wallet/src/remote_wallet.rs
	modified:   rpc/src/parsed_token_accounts.rs
	modified:   rpc/src/rpc.rs
	modified:   rpc/src/rpc_health.rs
	modified:   rpc/src/rpc_pubsub.rs
	modified:   rpc/src/rpc_service.rs
	modified:   rpc/src/rpc_subscriptions.rs
	modified:   rpc/src/send_transaction_service.rs
	modified:   runtime/benches/accounts.rs
	modified:   runtime/benches/bank.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/accounts_background_service.rs
	modified:   runtime/src/accounts_db.rs
	modified:   runtime/src/accounts_hash.rs
	modified:   runtime/src/accounts_index.rs
	modified:   runtime/src/ancestors.rs
	modified:   runtime/src/append_vec.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/bank_forks.rs
	modified:   runtime/src/epoch_stakes.rs
	modified:   runtime/src/genesis_utils.rs
	modified:   runtime/src/hardened_unpack.rs
	modified:   runtime/src/loader_utils.rs
	modified:   runtime/src/message_processor.rs
	modified:   runtime/src/native_loader.rs
	modified:   runtime/src/non_circulating_supply.rs
	modified:   runtime/src/secondary_index.rs
	modified:   runtime/src/serde_snapshot/future.rs
	modified:   runtime/src/serde_snapshot/tests.rs
	modified:   runtime/src/snapshot_utils.rs
	modified:   runtime/src/stakes.rs
	modified:   runtime/src/status_cache.rs
	modified:   runtime/src/system_instruction_processor.rs
	modified:   runtime/tests/accounts.rs
	modified:   runtime/tests/stake.rs
	modified:   sdk/program/src/message.rs
	modified:   sdk/program/src/slot_hashes.rs
	modified:   sdk/program/src/stake/state.rs
	modified:   sdk/src/account.rs
	modified:   sdk/src/derivation_path.rs
	modified:   sdk/src/genesis_config.rs
	modified:   sdk/src/nonce_keyed_account.rs
	modified:   sdk/src/signature.rs
	modified:   sdk/src/transaction.rs
	modified:   stake-accounts/src/args.rs
	modified:   stake-accounts/src/main.rs
	modified:   stake-accounts/src/stake_accounts.rs
	modified:   storage-bigtable/src/bigtable.rs
	modified:   storage-bigtable/src/lib.rs
	modified:   tokens/src/commands.rs
	modified:   transaction-status/src/token_balances.rs
	modified:   upload-perf/src/upload-perf.rs
	modified:   validator/src/bin/solana-test-validator.rs
	modified:   validator/src/dashboard.rs
	modified:   validator/src/main.rs
	modified:   watchtower/src/main.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   core/src/banking_stage.rs
	deleted by us:   core/src/cost_model.rs
	deleted by us:   core/src/cost_tracker.rs
	deleted by us:   core/src/execute_cost_table.rs
	both modified:   core/src/replay_stage.rs
	both modified:   core/src/tvu.rs
	both modified:   ledger-tool/src/main.rs
	deleted by us:   programs/bpf_loader/build.rs
	deleted by us:   rbpf-cli/src/main.rs
	both modified:   sdk/cargo-build-bpf/src/main.rs
	both modified:   sdk/cargo-test-bpf/src/main.rs
	both modified:   sdk/src/secp256k1_instruction.rs

Cherry-pick of c1e03f3 has failed:

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

You are currently cherry-picking commit c1e03f341.
  (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:   programs/bpf/tests/programs.rs

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://help.github.com/articles/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.io/

Lichtso added 3 commits June 18, 2021 17:57
@Lichtso
chore: cargo +nightly clippy --fix -Z unstable-options
4dfcb15 
(cherry picked from commit 6514096)

# Conflicts:
#	core/src/banking_stage.rs
#	core/src/cost_model.rs
#	core/src/cost_tracker.rs
#	core/src/execute_cost_table.rs
#	core/src/replay_stage.rs
#	core/src/tvu.rs
#	ledger-tool/src/main.rs
#	programs/bpf_loader/build.rs
#	rbpf-cli/src/main.rs
#	sdk/cargo-build-bpf/src/main.rs
#	sdk/cargo-test-bpf/src/main.rs
#	sdk/src/secp256k1_instruction.rs
@Lichtso
chore: cargo fmt
f1ae698 
(cherry picked from commit 789f33e)
@Lichtso
Updates BPF program assert_instruction_count tests.
5997925 
(cherry picked from commit c1e03f3)

# Conflicts:
#	programs/bpf/tests/programs.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jun 18, 2021
@mvines mvines self-assigned this Jun 18, 2021
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jun 18, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 18, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 18, 2021
@codecov
Copy link

codecov bot commented Jun 18, 2021

Codecov Report

Merging #18070 (60cb797) into v1.7 (cb13cde) will increase coverage by 0.0%.
The diff coverage is 81.0%.

@@           Coverage Diff            @@
##             v1.7   #18070    +/-   ##
========================================
  Coverage    82.5%    82.5%            
========================================
  Files         432      432            
  Lines      120570   120285   -285     
========================================
- Hits        99475    99273   -202     
+ Misses      21095    21012    -83

@mergify mergify bot merged commit 0e7512a into v1.7 Jun 18, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18065 branch June 18, 2021 20:02
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@mvines mvines

Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mvines @Lichtso