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

fixup! Handle cleaning of zero-lamport accounts w.r.t. Incremental Sn… #19213

Merged
merged 1 commit into from
Aug 12, 2021

Conversation

steviez
Copy link
Contributor

@steviez steviez commented Aug 12, 2021

…apshots (#18870)

Fixes some forgotten Some(...)'s:

error[E0308]: mismatched types
--
  | --> runtime/src/snapshot_utils.rs:2953:13
  | \|
  | 2953 \|             crate::accounts_index::BINS_FOR_TESTING,
  | \|             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  | \|             \|
  | \|             expected enum `std::option::Option`, found `usize`
  | \|             help: try using a variant of the expected enum: `accounts_db::_::_serde::__private::Some(crate::accounts_index::BINS_FOR_TESTING)`
  | \|
  | = note: expected enum `std::option::Option<usize>`
  | found type `usize`
  |  
  | error[E0308]: mismatched types
  | --> runtime/src/snapshot_utils.rs:3015:13
  | \|
  | 3015 \|             crate::accounts_index::BINS_FOR_TESTING,
  | \|             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  | \|             \|
  | \|             expected enum `std::option::Option`, found `usize`
  | \|             help: try using a variant of the expected enum: `accounts_db::_::_serde::__private::Some(crate::accounts_index::BINS_FOR_TESTING)`
  | \|
  | = note: expected enum `std::option::Option<usize>`
  | found type `usize`

@steviez steviez requested a review from brooksprumo August 12, 2021 22:21
@steviez steviez added the automerge Merge this Pull Request automatically once CI passes label Aug 12, 2021
@steviez steviez merged commit 772341d into solana-labs:master Aug 12, 2021
@steviez steviez removed the automerge Merge this Pull Request automatically once CI passes label Aug 12, 2021
@steviez steviez deleted the fixup_bins_for_testing branch August 13, 2021 19:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants