nelsbrock/fingerprunk
1
0
Fork 0
mirror of https://github.com/nelsbrock/fingerprunk.git synced 2026-08-14 16:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: fix some pedantic clippy lints

Browse Source
This commit is contained in:
nelsbrock
2026-05-10 18:02:54 +02:00
parent c8bedabe1f
commit 9f992caef9
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+5 -8
View File
@@ -97,11 +97,9 @@ impl Fingerprunk {
}; };
for num in 0..self.config.workers.get() { for num in 0..self.config.workers.get() {
let sender = sender.clone();
thread::Builder::new() thread::Builder::new()
.name(format!("worker-{num:03}")) .name(format!("worker-{num:03}"))
.spawn_scoped(scope, move || ref_self.worker_thread(sender))?; .spawn_scoped(scope, || ref_self.worker_thread(&sender))?;
} }
let mut stdout = io::stdout().lock(); let mut stdout = io::stdout().lock();
@@ -111,7 +109,7 @@ impl Fingerprunk {
match message { match message {
Message::Key(key) => { Message::Key(key) => {
let cert = self.key_to_cert(key)?; let cert = self.key_to_cert(key)?;
self.serialize_cert(cert, &mut stdout)?; self.serialize_cert(&cert, &mut stdout)?;
// Increase "found" counter and stop if enough matches have been found // Increase "found" counter and stop if enough matches have been found
let prev = self.counter_found.fetch_add(1, Ordering::Relaxed); let prev = self.counter_found.fetch_add(1, Ordering::Relaxed);
@@ -135,7 +133,7 @@ impl Fingerprunk {
}) })
} }
fn worker_thread(&self, sender: mpsc::SyncSender<Message>) { fn worker_thread(&self, sender: &mpsc::SyncSender<Message>) {
let mut fingerprint_hex = String::with_capacity(20 * 2); let mut fingerprint_hex = String::with_capacity(20 * 2);
while !self.stop.load(Ordering::Relaxed) { while !self.stop.load(Ordering::Relaxed) {
@@ -161,7 +159,7 @@ impl Fingerprunk {
.expect("should check regex without error") .expect("should check regex without error")
} }
fn key_to_cert(&self, key: SecretKey) -> anyhow::Result<Cert> { fn key_to_cert(&self, mut key: SecretKey) -> anyhow::Result<Cert> {
let creation_time = SystemTime::now(); let creation_time = SystemTime::now();
let mut signer = key let mut signer = key
@@ -175,7 +173,6 @@ impl Fingerprunk {
// Create certificate // Create certificate
let mut cert = Cert::try_from(Packet::SecretKey({ let mut cert = Cert::try_from(Packet::SecretKey({
let mut key = key.clone();
if let Some(ref password) = self.config.password { if let Some(ref password) = self.config.password {
let (k, mut secret) = key.take_secret(); let (k, mut secret) = key.take_secret();
secret.encrypt_in_place(&k, password)?; secret.encrypt_in_place(&k, password)?;
@@ -205,7 +202,7 @@ impl Fingerprunk {
Ok(cert) Ok(cert)
} }
fn serialize_cert(&self, cert: Cert, to: impl io::Write) -> anyhow::Result<()> { fn serialize_cert(&self, cert: &Cert, to: impl io::Write) -> anyhow::Result<()> {
let mut comments = cert.armor_headers(); let mut comments = cert.armor_headers();
comments.push(format!( comments.push(format!(
"Generated with Fingerprunk. Regex: {}", "Generated with Fingerprunk. Regex: {}",
src/main.rs
+2 -4
View File
@@ -93,7 +93,7 @@ fn main() -> anyhow::Result<()> {
"WARNING: No user ID was provided.\n\ "WARNING: No user ID was provided.\n\
You may experience problems importing generated keys into GnuPG.\n\ You may experience problems importing generated keys into GnuPG.\n\
Use `--userid <USERID>` to add a user ID.\n" Use `--userid <USERID>` to add a user ID.\n"
) );
} }
let password = if args.password { let password = if args.password {
@@ -125,7 +125,5 @@ fn main() -> anyhow::Result<()> {
workers, workers,
}; };
Fingerprunk::new_from_config(config).run()?; Fingerprunk::new_from_config(config).run()
Ok(())
} }