Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Fix lint introduced by Rust 1.71.0 #172

Merged
merged 3 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libsawtooth/src/families/smallbank/workload/playlist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ impl<'a> FmtWriter<'a> {
impl<'a> fmt::Write for FmtWriter<'a> {
fn write_str(&mut self, s: &str) -> Result<(), fmt::Error> {
let w = &mut *self.writer;
w.write_all(s.as_bytes()).map_err(|_| fmt::Error::default())
w.write_all(s.as_bytes()).map_err(|_| fmt::Error)
}
}

Expand Down
2 changes: 1 addition & 1 deletion libsawtooth/src/journal/publisher/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ impl BlockPublisher {
/// * The summary of the batches
fn complete_candidate_block(
&self,
mut candidate_block: &mut CandidateBlock,
candidate_block: &mut CandidateBlock,
) -> Result<(), BlockPublisherError> {
// Check if candidate block is already completed
if candidate_block.summary.is_some() {
Expand Down
6 changes: 3 additions & 3 deletions libsawtooth/tests/state/merkle/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ where
key: key_hash.to_string(),
value: "2.0".as_bytes().to_vec(),
});
values.insert(key_hash.clone().to_string(), "2.0".to_string());
values.insert(key_hash.to_string(), "2.0".to_string());
}

// The first item below(e55420...89b9) shares a common prefix
Expand Down Expand Up @@ -449,10 +449,10 @@ fn test_merkle_trie_update_same_address_space_with_no_children<M>(
// Perform some updates on the lower keys
for &(_, ref key_hash) in key_hash_to_be_inserted.iter() {
state_changes.push(StateChange::Set {
key: key_hash.clone().to_string(),
key: key_hash.to_string(),
value: "2.0".as_bytes().to_vec(),
});
values.insert(key_hash.clone().to_string(), "2.0".to_string());
values.insert(key_hash.to_string(), "2.0".to_string());
}

// The first item below(e55420...89b9) shares a common prefix
Expand Down
Loading