From 9d9773bd2a55ebd1fe2f6b8f05ba2d6c3e623d0a Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Sun, 22 May 2022 19:10:48 -0700 Subject: [PATCH] Use write! instead of format! to pacify clippy --- ledger-tool/src/main.rs | 3 ++- ledger/src/blockstore.rs | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 5e1a8c35b..5f730016d 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -3011,7 +3011,8 @@ fn main() { if detail.skipped_reasons.is_empty() { detail.skipped_reasons = format!("{:?}", skipped_reason); } else { - detail.skipped_reasons += &format!("/{:?}", skipped_reason); + use std::fmt::Write; + let _ = write!(&mut detail.skipped_reasons, "/{:?}", skipped_reason); } } } diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs index 756e4ca2e..d175ef9a8 100644 --- a/ledger/src/blockstore.rs +++ b/ledger/src/blockstore.rs @@ -51,6 +51,7 @@ use { cmp, collections::{hash_map::Entry as HashMapEntry, BTreeSet, HashMap, HashSet}, convert::TryInto, + fmt::Write, fs, io::{Error as IoError, ErrorKind}, path::{Path, PathBuf}, @@ -3869,27 +3870,33 @@ pub fn create_new_ledger( ledger_path.join(format!("{}.failed", DEFAULT_GENESIS_ARCHIVE)), ) .unwrap_or_else(|e| { - error_messages += &format!( + let _ = write!( + &mut error_messages, "/failed to stash problematic {}: {}", DEFAULT_GENESIS_ARCHIVE, e - ) + ); }); fs::rename( &ledger_path.join(DEFAULT_GENESIS_FILE), ledger_path.join(format!("{}.failed", DEFAULT_GENESIS_FILE)), ) .unwrap_or_else(|e| { - error_messages += &format!( + let _ = write!( + &mut error_messages, "/failed to stash problematic {}: {}", DEFAULT_GENESIS_FILE, e - ) + ); }); fs::rename( &ledger_path.join(blockstore_dir), ledger_path.join(format!("{}.failed", blockstore_dir)), ) .unwrap_or_else(|e| { - error_messages += &format!("/failed to stash problematic {}: {}", blockstore_dir, e) + let _ = write!( + &mut error_messages, + "/failed to stash problematic {}: {}", + blockstore_dir, e + ); }); return Err(BlockstoreError::Io(IoError::new(