Merge branch 'master' into wen_restart_set_root_when_finding_bankhash

core/src/banking_stage/latest_unprocessed_votes.rs

@@ -354,9 +354,8 @@ impl LatestUnprocessedVotes {
                     if !Self::is_valid_for_our_fork(&latest_vote, &slot_hashes) {
                         return None;
                     }
-                    latest_vote.take_vote().map(|vote| {
+                    latest_vote.take_vote().inspect(|_vote| {
                         self.num_unprocessed_votes.fetch_sub(1, Ordering::Relaxed);
-                        vote
                     })
                 })
             })

core/src/replay_stage.rs

@@ -1999,6 +1999,7 @@ impl ReplayStage {
     /// - Bank forks already contains a bank for this leader slot
     /// - We have not landed a vote yet and the `wait_for_vote_to_start_leader` flag is set
     /// - We have failed the propagated check
+    ///
     /// Returns whether a new working bank was created and inserted into bank forks.
     #[allow(clippy::too_many_arguments)]
     fn maybe_start_leader(