From fc9d2620e8a99214bd0cf24c69e0c9830bfebc7a Mon Sep 17 00:00:00 2001 From: Felix Obenhuber Date: Tue, 10 Dec 2024 09:01:22 +0100 Subject: [PATCH] Fix clippy --- northstar-runtime/src/common/name.rs | 2 +- northstar-runtime/src/common/non_nul_string.rs | 2 +- northstar-runtime/src/npk/dm_verity.rs | 2 +- northstar-runtime/src/npk/manifest/mount.rs | 4 ++-- northstar-runtime/src/runtime/devicemapper/verity.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/northstar-runtime/src/common/name.rs b/northstar-runtime/src/common/name.rs index 3ea768de2..db85aa33a 100644 --- a/northstar-runtime/src/common/name.rs +++ b/northstar-runtime/src/common/name.rs @@ -99,7 +99,7 @@ impl<'de> Deserialize<'de> for Name { { struct NameVisitor; - impl<'de> Visitor<'de> for NameVisitor { + impl Visitor<'_> for NameVisitor { type Value = Name; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/northstar-runtime/src/common/non_nul_string.rs b/northstar-runtime/src/common/non_nul_string.rs index 3a1be0979..73b11777a 100644 --- a/northstar-runtime/src/common/non_nul_string.rs +++ b/northstar-runtime/src/common/non_nul_string.rs @@ -134,7 +134,7 @@ impl<'de> Deserialize<'de> for NonNulString { { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor { + impl serde::de::Visitor<'_> for Visitor { type Value = NonNulString; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/northstar-runtime/src/npk/dm_verity.rs b/northstar-runtime/src/npk/dm_verity.rs index 79cf59b81..5e1807d03 100644 --- a/northstar-runtime/src/npk/dm_verity.rs +++ b/northstar-runtime/src/npk/dm_verity.rs @@ -152,7 +152,7 @@ fn calculate_hash_tree_level_offsets( let mut rem_size = image_size; while rem_size > block_size { - let num_blocks = (rem_size + block_size - 1) / block_size; + let num_blocks = rem_size.div_ceil(block_size); let level_size = round_up_to_multiple(num_blocks * digest_size, block_size); level_sizes.push(level_size); diff --git a/northstar-runtime/src/npk/manifest/mount.rs b/northstar-runtime/src/npk/manifest/mount.rs index 561c45fa5..fd9c0b9cd 100644 --- a/northstar-runtime/src/npk/manifest/mount.rs +++ b/northstar-runtime/src/npk/manifest/mount.rs @@ -174,7 +174,7 @@ impl<'de> Deserialize<'de> for MountOptions { D: Deserializer<'de>, { struct MountOptionsVisitor; - impl<'de> Visitor<'de> for MountOptionsVisitor { + impl Visitor<'_> for MountOptionsVisitor { type Value = MountOptions; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -205,7 +205,7 @@ impl<'de> Deserialize<'de> for MountOptions { fn deserialize_tmpfs_size<'de, D: Deserializer<'de>>(deserializer: D) -> Result { struct SizeVisitor; - impl<'de> Visitor<'de> for SizeVisitor { + impl Visitor<'_> for SizeVisitor { type Value = u64; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { formatter.write_str("a number of bytes or a string with the size (e.g. 25M)") diff --git a/northstar-runtime/src/runtime/devicemapper/verity.rs b/northstar-runtime/src/runtime/devicemapper/verity.rs index aabe7458d..79b8ae51c 100644 --- a/northstar-runtime/src/runtime/devicemapper/verity.rs +++ b/northstar-runtime/src/runtime/devicemapper/verity.rs @@ -66,7 +66,7 @@ impl DmVerityTarget { } } -impl<'a> Default for DmVerityTargetBuilder<'a> { +impl Default for DmVerityTargetBuilder<'_> { fn default() -> Self { DmVerityTargetBuilder { version: DmVerityVersion::V1,