Skip to content

Commit 998eab9

Browse files
committed
cargo fmt ✨
1 parent 5f8e3f0 commit 998eab9

5 files changed

Lines changed: 30 additions & 16 deletions

File tree

src/pgp.rs

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ use std::{fs, io::Write};
33
use anyhow::Result;
44
use axum::{Router, extract::State, routing::get};
55
use sequoia_openpgp::{
6-
armor::Kind, cert::prelude::*, crypto::Password, parse::Parse, policy::StandardPolicy, serialize::{
7-
stream::{Armorer, Message, Signer}, SerializeInto
8-
}
6+
armor::Kind,
7+
cert::prelude::*,
8+
crypto::Password,
9+
parse::Parse,
10+
policy::StandardPolicy,
11+
serialize::{
12+
SerializeInto,
13+
stream::{Armorer, Message, Signer},
14+
},
915
};
1016

1117
use crate::state::AppState;
@@ -65,7 +71,11 @@ pub fn clearsign_metadata(data: &str, cert: &Cert, passphrase: &Password) -> Res
6571
Ok(sink)
6672
}
6773

68-
pub fn detached_sign_metadata(content: &str, cert: &Cert, passphrase: &Password) -> Result<Vec<u8>> {
74+
pub fn detached_sign_metadata(
75+
content: &str,
76+
cert: &Cert,
77+
passphrase: &Password,
78+
) -> Result<Vec<u8>> {
6979
let binding = StandardPolicy::new();
7080
let key = cert
7181
.keys()
@@ -84,7 +94,9 @@ pub fn detached_sign_metadata(content: &str, cert: &Cert, passphrase: &Password)
8494
let keypair = decrypted_key.into_keypair()?;
8595

8696
let mut sink = vec![];
87-
let message = Armorer::new(Message::new(&mut sink)).kind(Kind::Signature).build()?;
97+
let message = Armorer::new(Message::new(&mut sink))
98+
.kind(Kind::Signature)
99+
.build()?;
88100
let mut signer = Signer::new(message, keypair)?.detached().build()?;
89101

90102
signer.write_all(content.as_bytes())?;
@@ -169,8 +181,8 @@ mod tests {
169181
let policy = StandardPolicy::new();
170182

171183
// Create verifier with our helper
172-
let mut verifier = VerifierBuilder::from_bytes(&signed_message)?
173-
.with_policy(&policy, None, helper)?;
184+
let mut verifier =
185+
VerifierBuilder::from_bytes(&signed_message)?.with_policy(&policy, None, helper)?;
174186

175187
// Read the verified content
176188
let mut verified_content = Vec::new();

src/platform.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ static PRE_RELEASE_STRIPER: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(\d+
1111
static APT: LazyLock<Regex> = LazyLock::new(|| Regex::new(r#"Debian APT.+\((.+)\)"#).unwrap());
1212
static FEDORA: LazyLock<Regex> =
1313
LazyLock::new(|| Regex::new(r#"libdnf \(Fedora Linux (\d+);"#).unwrap());
14-
static TUMBLEWEED: LazyLock<Regex> =
15-
LazyLock::new(|| Regex::new(r#"ZYpp.+"#).unwrap());
14+
static TUMBLEWEED: LazyLock<Regex> = LazyLock::new(|| Regex::new(r#"ZYpp.+"#).unwrap());
1615

1716
/// Detects platform based on the user-agent string of `apt` package manager.
1817
pub struct AptPlatformDetection {
@@ -226,8 +225,6 @@ mod tests {
226225
assert!(detect_opensuse_tumbleweed(
227226
"ZYpp 17.31.15 (curl 8.5.0) openSUSE-Tumbleweed-x86_64"
228227
));
229-
assert!(detect_opensuse_tumbleweed(
230-
"ZYpp 17.37.17 (curl 8.15.0)"
231-
));
228+
assert!(detect_opensuse_tumbleweed("ZYpp 17.37.17 (curl 8.15.0)"));
232229
}
233230
}

src/rpm/index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ mod tests {
114114
use chrono::DateTime;
115115
use insta::assert_snapshot;
116116

117-
use crate::package::{tests::package_with_ver, Package};
118117
use super::*;
118+
use crate::package::{Package, tests::package_with_ver};
119119

120120
#[test]
121121
fn test_rpm_indices() {

src/rpm/package.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ impl RPMPackage {
5858
pub fn from_package(package: &Package) -> Result<RPMPackage> {
5959
// If the metadata is already available, then build the RPMPackage from it
6060
if let Data::Metadata(metadata) = package.data() {
61-
let rpm: RPMPackage = from_str(&metadata).context("Error while loading RPMPackage from saved Package metadata")?;
61+
let rpm: RPMPackage = from_str(&metadata)
62+
.context("Error while loading RPMPackage from saved Package metadata")?;
6263
return Ok(rpm);
6364
}
6465

@@ -191,8 +192,8 @@ mod tests {
191192

192193
use insta::assert_debug_snapshot;
193194

194-
use crate::package::tests::package_with_ver;
195195
use super::*;
196+
use crate::package::tests::package_with_ver;
196197

197198
#[test]
198199
fn test_parser() {

src/rpm/routes.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ async fn index(
3030
.select_package_rpm(agent.as_str())
3131
.await?
3232
.into_iter()
33-
.map(|p| RPMPackage::from_package(&p).context(format!("Error while parsing package into RPMPackage: {p:?}")))
33+
.map(|p| {
34+
RPMPackage::from_package(&p).context(format!(
35+
"Error while parsing package into RPMPackage: {p:?}"
36+
))
37+
})
3438
.collect::<Result<Vec<_>, _>>()?;
3539

3640
repo.save_package_metadata().await;

0 commit comments

Comments
 (0)