From 598dbc38c7dba3723fe77de3678bb8eb6a6ba551 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 16 Jun 2024 10:37:40 +0800 Subject: [PATCH] feat: v1.7.13 --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/util.rs | 4 +++- src/util_gpg.rs | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 592b933..b033360 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1866,7 +1866,7 @@ dependencies = [ [[package]] name = "tiny-encrypt" -version = "1.7.12" +version = "1.7.13" dependencies = [ "aes-gcm-stream", "base64", diff --git a/Cargo.toml b/Cargo.toml index e5f1db0..7d2c893 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tiny-encrypt" -version = "1.7.12" +version = "1.7.13" edition = "2021" license = "MIT" description = "A simple and tiny file encrypt tool" diff --git a/src/util.rs b/src/util.rs index 83df2a7..f1de73d 100644 --- a/src/util.rs +++ b/src/util.rs @@ -214,7 +214,7 @@ pub fn read_number(hint: &str, from: usize, to: usize) -> usize { } pub fn is_tiny_enc_file(filename: &str) -> bool { - return filename.ends_with(TINY_ENC_FILE_EXT) || filename.ends_with(TINY_ENC_PEM_FILE_EXT); + filename.ends_with(TINY_ENC_FILE_EXT) || filename.ends_with(TINY_ENC_PEM_FILE_EXT) } pub fn get_user_agent() -> String { @@ -291,9 +291,11 @@ pub fn ratio(numerator: u64, denominator: u64) -> String { format!("{:.2}", r as f64 / 100f64) } +#[allow(clippy::declare_interior_mutable_const)] const CTRL_C_SET: AtomicBool = AtomicBool::new(false); pub fn register_ctrlc() { + #[allow(clippy::borrow_interior_mutable_const)] if !CTRL_C_SET.load(Ordering::SeqCst) { CTRL_C_SET.store(true, Ordering::SeqCst); let _ = ctrlc::set_handler(move || { diff --git a/src/util_gpg.rs b/src/util_gpg.rs index b1fbe88..13e685b 100644 --- a/src/util_gpg.rs +++ b/src/util_gpg.rs @@ -51,8 +51,8 @@ pub fn gpg_encrypt(key_id: &str, message: &[u8]) -> XResult { let gpg_encrypt_result = cmd .args([ "-e", "-a", "--no-comment", - "-r", &key_id, - "--comment", &format!("tiny-encrypt-v{} - {}", env!("CARGO_PKG_VERSION"), &key_id) + "-r", key_id, + "--comment", &format!("tiny-encrypt-v{} - {}", env!("CARGO_PKG_VERSION"), key_id) ]) .stdin(Stdio::piped()) .stdout(Stdio::piped())