Skip to content

Commit aea7619

Browse files
committed
fix: clippy warnings with Rust '1.78.0'
1 parent 772791e commit aea7619

File tree

10 files changed

+25
-23
lines changed

10 files changed

+25
-23
lines changed

internal/mithril-build-script/src/open_api.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ info:
145145
write_minimal_open_api_file("2.0.0", &sub_folder.join("openapi-thales.yaml"));
146146

147147
let expected = r#"("openapi-thales.yaml".to_string(), semver::Version::new(2, 0, 0)), ("openapi.yaml".to_string(), semver::Version::new(1, 0, 0))"#;
148-
let generated_code = generate_open_api_versions_mapping(&[&parent_folder, &sub_folder]);
148+
let generated_code = generate_open_api_versions_mapping(&[parent_folder, &sub_folder]);
149149

150150
assert_open_api_content_contains(expected, &generated_code);
151151
}
@@ -162,7 +162,7 @@ info:
162162
let expected = r#"HashMap::from([
163163
("openapi.yaml".to_string(), semver::Version::new(2, 0, 0)),
164164
])"#;
165-
let generated_code = generate_open_api_versions_mapping(&[&parent_folder, &sub_folder]);
165+
let generated_code = generate_open_api_versions_mapping(&[parent_folder, &sub_folder]);
166166

167167
assert_open_api_content_contains(expected, &generated_code);
168168
}

internal/mithril-doc/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,14 @@ impl StructDoc {
8787
} else {
8888
let mut d = data_map1.get(&field_doc.parameter).unwrap().clone();
8989
if d.default_value.is_none() {
90-
d.default_value = field_doc.default_value.clone();
90+
d.default_value.clone_from(&field_doc.default_value);
9191
}
9292
if d.example.is_none() {
93-
d.example = field_doc.example.clone();
93+
d.example.clone_from(&field_doc.example);
9494
}
9595
if d.environment_variable.is_none() {
96-
d.environment_variable = field_doc.environment_variable.clone();
96+
d.environment_variable
97+
.clone_from(&field_doc.environment_variable);
9798
}
9899
data_map1.insert(field_doc.parameter.clone(), d);
99100
}

mithril-aggregator/src/signer_registerer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ impl SignerRegisterer for MithrilSignerRegisterer {
251251
.get(&party_id_save)
252252
.unwrap(),
253253
);
254-
signer_save.party_id = party_id_save.clone();
254+
signer_save.party_id.clone_from(&party_id_save);
255255

256256
self.signer_recorder
257257
.record_signer_registration(party_id_save)

mithril-aggregator/src/tools/certificates_hash_migrator.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ impl CertificatesHashMigrator {
6666
certificate.previous_hash.clone()
6767
} else {
6868
let old_previous_hash = certificate.previous_hash.clone();
69-
certificate.previous_hash = old_and_new_hashes
69+
old_and_new_hashes
7070
.get(&certificate.previous_hash)
7171
.ok_or(anyhow!(
7272
"Could not migrate certificate previous_hash: The hash '{}' doesn't exist in the certificate table",
7373
&certificate.previous_hash
74-
))?.to_owned();
74+
))?.clone_into(&mut certificate.previous_hash);
7575

7676
old_previous_hash
7777
};
@@ -332,7 +332,7 @@ mod test {
332332

333333
for (mut certificate, signed_entity_maybe) in certificates_and_signed_entity {
334334
if let Some(hash) = old_and_new_hashes.get(&certificate.previous_hash) {
335-
certificate.previous_hash = hash.clone();
335+
certificate.previous_hash.clone_from(hash);
336336
}
337337

338338
let new_hash = certificate.compute_hash();
@@ -342,7 +342,7 @@ mod test {
342342
let signed_entity_maybe = match signed_entity_maybe {
343343
None => None,
344344
Some(mut signed_entity) => {
345-
signed_entity.certificate_id = certificate.hash.clone();
345+
signed_entity.certificate_id.clone_from(&certificate.hash);
346346
Some(signed_entity)
347347
}
348348
};

mithril-common/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::path::Path;
77

88
fn main() {
99
let out_dir = env::var_os("OUT_DIR").unwrap();
10-
let open_api_code = generate_open_api_versions_mapping(&[Path::new("./"), &Path::new("../")]);
10+
let open_api_code = generate_open_api_versions_mapping(&[Path::new("./"), (Path::new("../"))]);
1111

1212
fs::write(Path::new(&out_dir).join("open_api.rs"), open_api_code).unwrap();
1313
}

mithril-common/src/certificate_chain/certificate_verifier.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,9 @@ mod tests {
468468
"another-avk".to_string(),
469469
);
470470
fake_certificate2.hash = fake_certificate2.compute_hash();
471-
fake_certificate1.previous_hash = fake_certificate2.hash.clone();
471+
fake_certificate1
472+
.previous_hash
473+
.clone_from(&fake_certificate2.hash);
472474
fake_certificate1.hash = fake_certificate1.compute_hash();
473475
let mut mock_certificate_retriever = MockCertificateRetrieverImpl::new();
474476
mock_certificate_retriever

mithril-common/src/chain_observer/cli_observer.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,7 @@ mod tests {
635635
.get("pool1qz2vzszautc2c8mljnqre2857dpmheq7kgt6vav0s38tvvhxm6w")
636636
.unwrap()
637637
);
638-
assert!(results
639-
.get("pool1qpqvz90w7qsex2al2ejjej0rfgrwsguch307w8fraw7a7adf6g8")
640-
.is_none());
638+
assert!(!results.contains_key("pool1qpqvz90w7qsex2al2ejjej0rfgrwsguch307w8fraw7a7adf6g8"));
641639
}
642640

643641
#[tokio::test]

mithril-common/src/crypto_helper/merkle_tree.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use ckb_merkle_mountain_range::{
88
use serde::{Deserialize, Serialize};
99
use std::{
1010
collections::{BTreeMap, HashMap},
11+
fmt::Display,
1112
ops::{Add, Deref},
1213
sync::Arc,
1314
};
@@ -82,9 +83,9 @@ impl TryFrom<&MKTree> for MKTreeNode {
8283
}
8384
}
8485

85-
impl ToString for MKTreeNode {
86-
fn to_string(&self) -> String {
87-
String::from_utf8_lossy(&self.hash).to_string()
86+
impl Display for MKTreeNode {
87+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
88+
write!(f, "{}", String::from_utf8_lossy(&self.hash))
8889
}
8990
}
9091

mithril-common/src/digesters/immutable_file.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ impl ImmutableFile {
117117
}
118118

119119
/// Compute the hash of this immutable file.
120-
pub fn compute_raw_hash<D: Digest>(&self) -> Result<Output<D>, io::Error>
120+
pub fn compute_raw_hash<D>(&self) -> Result<Output<D>, io::Error>
121121
where
122-
D: io::Write,
122+
D: Digest + io::Write,
123123
{
124124
let mut hasher = D::new();
125125
let mut file = File::open(&self.path)?;

mithril-stm/src/merkle_tree.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ impl<D: Clone + Digest> MerkleTreeCommitmentBatchCompat<D> {
375375
}
376376
i += 1;
377377
}
378-
leaves = new_hashes.clone();
379-
ordered_indices = new_indices.clone();
378+
leaves.clone_from(&new_hashes);
379+
ordered_indices.clone_from(&new_indices);
380380
}
381381

382382
if leaves.len() == 1 && leaves[0] == self.root {
@@ -541,7 +541,7 @@ impl<D: Digest + FixedOutput> MerkleTree<D> {
541541
}
542542
i += 1;
543543
}
544-
ordered_indices = new_indices.clone();
544+
ordered_indices.clone_from(&new_indices);
545545
}
546546

547547
BatchPath {

0 commit comments

Comments
 (0)