NotAShelf/stash
1
0
Fork 0
mirror of https://github.com/NotAShelf/stash.git synced 2026-04-13 14:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

treewide: fix remaining clippy warnings

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a6964a4f18b72e3fa774cec6b81baa8267cb6
This commit is contained in:
raf 2025-08-12 16:45:00 +03:00
commit aa602edbee
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/commands/delete.rs
View file

@ -10,11 +10,11 @@ impl DeleteCommand for SledClipboardDb {
fn delete(&self, input: impl Read) -> Result<usize, StashError> { fn delete(&self, input: impl Read) -> Result<usize, StashError> {
match self.delete_entries(input) { match self.delete_entries(input) {
Ok(deleted) => { Ok(deleted) => {
log::info!("Deleted {} entries", deleted); log::info!("Deleted {deleted} entries");
Ok(deleted) Ok(deleted)
} }
Err(e) => { Err(e) => {
log::error!("Failed to delete entries: {}", e); log::error!("Failed to delete entries: {e}");
Err(e) Err(e)
} }
} }

13
src/db/mod.rs
View file

@ -130,7 +130,12 @@ impl ClipboardDb for SledClipboardDb {
fn deduplicate(&self, buf: &[u8], max: u64) -> Result<usize, StashError> { fn deduplicate(&self, buf: &[u8], max: u64) -> Result<usize, StashError> {
let mut count = 0; let mut count = 0;
let mut deduped = 0; let mut deduped = 0;
for item in self.db.iter().rev().take(max as usize) { for item in self
.db
.iter()
.rev()
.take(usize::try_from(max).unwrap_or(usize::MAX))
{
let (k, v) = match item { let (k, v) = match item {
Ok((k, v)) => (k, v), Ok((k, v)) => (k, v),
Err(e) => return Err(StashError::DeduplicationRead(e.to_string())), Err(e) => return Err(StashError::DeduplicationRead(e.to_string())),
@ -166,7 +171,7 @@ impl ClipboardDb for SledClipboardDb {
}) })
.collect(); .collect();
if keys.len() as u64 > max { if keys.len() as u64 > max {
for k in keys.drain((max as usize)..) { for k in keys.drain(usize::try_from(max).unwrap_or(0)..) {
self.db self.db
.remove(k) .remove(k)
.map_err(|e| StashError::Trim(e.to_string()))?; .map_err(|e| StashError::Trim(e.to_string()))?;
@ -225,7 +230,7 @@ impl ClipboardDb for SledClipboardDb {
.db .db
.get(u64_to_ivec(id)) .get(u64_to_ivec(id))
.map_err(|e| StashError::DecodeGet(e.to_string()))? .map_err(|e| StashError::DecodeGet(e.to_string()))?
.ok_or_else(|| StashError::DecodeNoEntry(id))?; .ok_or(StashError::DecodeNoEntry(id))?;
let entry: Entry = let entry: Entry =
from_read(v.as_ref()).map_err(|e| StashError::DecodeDecode(e.to_string()))?; from_read(v.as_ref()).map_err(|e| StashError::DecodeDecode(e.to_string()))?;
@ -361,7 +366,7 @@ pub fn truncate(s: &str, max: usize, ellip: &str) -> String {
pub fn size_str(size: usize) -> String { pub fn size_str(size: usize) -> String {
let units = ["B", "KiB", "MiB"]; let units = ["B", "KiB", "MiB"];
let mut fsize = size as f64; let mut fsize = f64::from(u32::try_from(size).unwrap_or(u32::MAX));
let mut i = 0; let mut i = 0;
while fsize >= 1024.0 && i < units.len() - 1 { while fsize >= 1024.0 && i < units.len() - 1 {
fsize /= 1024.0; fsize /= 1024.0;