summaryrefslogtreecommitdiffhomepage
path: root/mullvad-update/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-02-22 19:23:54 +0100
committerDavid Lönnhager <david.l@mullvad.net>2025-03-05 23:32:15 +0100
commite07bbc0cfb3036310e2e297abb908041c5def540 (patch)
tree7d116923013440eed140200ed5c50e05afd073b9 /mullvad-update/src
parent0e62c2f3f611f4a300fd481d6d6f073d53d8e220 (diff)
downloadmullvadvpn-e07bbc0cfb3036310e2e297abb908041c5def540.tar.xz
mullvadvpn-e07bbc0cfb3036310e2e297abb908041c5def540.zip
Fix clippy lints
Diffstat (limited to 'mullvad-update/src')
-rw-r--r--mullvad-update/src/bin/mullvad-version-metadata.rs2
-rw-r--r--mullvad-update/src/format/deserializer.rs4
-rw-r--r--mullvad-update/src/format/key.rs10
-rw-r--r--mullvad-update/src/version.rs4
4 files changed, 10 insertions, 10 deletions
diff --git a/mullvad-update/src/bin/mullvad-version-metadata.rs b/mullvad-update/src/bin/mullvad-version-metadata.rs
index fbfc0ed51b..c531fbe9dd 100644
--- a/mullvad-update/src/bin/mullvad-version-metadata.rs
+++ b/mullvad-update/src/bin/mullvad-version-metadata.rs
@@ -35,7 +35,7 @@ async fn main() -> anyhow::Result<()> {
match opt {
Opt::GenerateKey => {
- println!("{}", key::SecretKey::generate().to_string());
+ println!("{}", key::SecretKey::generate());
Ok(())
}
Opt::Sign { file, secret } => sign(file, secret).await,
diff --git a/mullvad-update/src/format/deserializer.rs b/mullvad-update/src/format/deserializer.rs
index 28291dde00..f79aab6537 100644
--- a/mullvad-update/src/format/deserializer.rs
+++ b/mullvad-update/src/format/deserializer.rs
@@ -40,7 +40,7 @@ impl SignedResponse {
min_metadata_version: usize,
) -> Result<Self, anyhow::Error> {
// Deserialize and verify signature
- let partial_data = deserialize_and_verify(&key, bytes)?;
+ let partial_data = deserialize_and_verify(key, bytes)?;
// Deserialize the canonical JSON to structured representation
let signed_response: Response = serde_json::from_value(partial_data.signed)
@@ -182,7 +182,7 @@ mod test {
.expect("deserialization failed");
let expected_key = VerifyingKey::from_hex(pubkey).unwrap();
- let expected_sig = Signature::from_hex(&fakesig).unwrap();
+ let expected_sig = Signature::from_hex(fakesig).unwrap();
// Ed25519 key
assert!(
diff --git a/mullvad-update/src/format/key.rs b/mullvad-update/src/format/key.rs
index a951aff709..01cd51a6ea 100644
--- a/mullvad-update/src/format/key.rs
+++ b/mullvad-update/src/format/key.rs
@@ -1,6 +1,6 @@
//! Key and signature types for API version response format
-use std::str::FromStr;
+use std::{fmt, str::FromStr};
use anyhow::{bail, Context};
use ed25519_dalek::ed25519::signature::SignerMut;
@@ -34,9 +34,9 @@ impl SecretKey {
}
}
-impl ToString for SecretKey {
- fn to_string(&self) -> String {
- hex::encode(self.0)
+impl fmt::Display for SecretKey {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ write!(f, "{}", hex::encode(self.0))
}
}
@@ -56,7 +56,7 @@ impl FromStr for SecretKey {
type Err = anyhow::Error;
fn from_str(s: &str) -> Result<Self, Self::Err> {
- let bytes = bytes_from_hex::<{ ed25519_dalek::SECRET_KEY_LENGTH }>(&s)?;
+ let bytes = bytes_from_hex::<{ ed25519_dalek::SECRET_KEY_LENGTH }>(s)?;
Ok(SecretKey(bytes))
}
}
diff --git a/mullvad-update/src/version.rs b/mullvad-update/src/version.rs
index 5317cf8d49..80c28c7846 100644
--- a/mullvad-update/src/version.rs
+++ b/mullvad-update/src/version.rs
@@ -121,7 +121,7 @@ impl VersionInfo {
Ok(Self {
stable: Version::try_from(stable)?,
- beta: beta.map(|beta| Version::try_from(beta)).transpose()?,
+ beta: beta.map(Version::try_from).transpose()?,
})
}
@@ -131,7 +131,7 @@ impl VersionInfo {
fn find_duplicate_version(releases: &[format::Release]) -> Option<&mullvad_version::Version> {
releases
.windows(2)
- .find(|pair| &pair[0].version == &pair[1].version)
+ .find(|pair| pair[0].version == pair[1].version)
.map(|pair| &pair[0].version)
}
}