From e008b657a5f260ffa052d4a03bdd901277f07e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= <7822554+AlexTMjugador@users.noreply.github.com> Date: Sat, 12 Apr 2025 15:45:17 +0200 Subject: [PATCH] Fix Clippy lints (#3494) * chore: fix some Clippy lints * chore(labrinth): more Clippy fixes --- apps/daedalus_client/src/forge.rs | 2 +- apps/labrinth/src/models/v3/billing.rs | 4 ++-- apps/labrinth/src/routes/v2/version_creation.rs | 2 +- apps/labrinth/src/routes/v3/version_file.rs | 6 +++--- packages/app-lib/src/api/pack/import/curseforge.rs | 2 +- packages/app-lib/src/util/io.rs | 7 ++----- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/apps/daedalus_client/src/forge.rs b/apps/daedalus_client/src/forge.rs index 5591f3211..a4f7a33a9 100644 --- a/apps/daedalus_client/src/forge.rs +++ b/apps/daedalus_client/src/forge.rs @@ -598,7 +598,7 @@ async fn fetch( )) })?; - let file_name = value.split('/').last() + let file_name = value.split('/').next_back() .ok_or_else(|| { crate::ErrorKind::InvalidInput(format!( "Unable reading filename for data key {key} at path {value}", diff --git a/apps/labrinth/src/models/v3/billing.rs b/apps/labrinth/src/models/v3/billing.rs index ade642d1e..b9892a973 100644 --- a/apps/labrinth/src/models/v3/billing.rs +++ b/apps/labrinth/src/models/v3/billing.rs @@ -189,8 +189,8 @@ impl ChargeType { pub fn as_str(&self) -> &'static str { match self { ChargeType::OneTime => "one-time", - ChargeType::Subscription { .. } => "subscription", - ChargeType::Proration { .. } => "proration", + ChargeType::Subscription => "subscription", + ChargeType::Proration => "proration", ChargeType::Refund => "refund", } } diff --git a/apps/labrinth/src/routes/v2/version_creation.rs b/apps/labrinth/src/routes/v2/version_creation.rs index ba8248db7..c86b2eb15 100644 --- a/apps/labrinth/src/routes/v2/version_creation.rs +++ b/apps/labrinth/src/routes/v2/version_creation.rs @@ -188,7 +188,7 @@ pub async fn version_create( // Handle project type via file extension prediction let mut project_type = None; for file_part in &legacy_create.file_parts { - if let Some(ext) = file_part.split('.').last() { + if let Some(ext) = file_part.split('.').next_back() { match ext { "mrpack" | "mrpack-primary" => { project_type = Some("modpack"); diff --git a/apps/labrinth/src/routes/v3/version_file.rs b/apps/labrinth/src/routes/v3/version_file.rs index e34d8ef53..76bcd3476 100644 --- a/apps/labrinth/src/routes/v3/version_file.rs +++ b/apps/labrinth/src/routes/v3/version_file.rs @@ -155,7 +155,7 @@ pub async fn get_update_from_hash( database::models::Project::get_id(file.project_id, &**pool, &redis) .await? { - let versions = database::models::Version::get_many( + let mut versions = database::models::Version::get_many( &project.versions, &**pool, &redis, @@ -191,7 +191,7 @@ pub async fn get_update_from_hash( }) .sorted(); - if let Some(first) = versions.last() { + if let Some(first) = versions.next_back() { if !is_visible_version( &first.inner, &user_option, @@ -523,7 +523,7 @@ pub async fn update_individual_files( bool }) .sorted() - .last(); + .next_back(); if let Some(version) = version { if is_visible_version( diff --git a/packages/app-lib/src/api/pack/import/curseforge.rs b/packages/app-lib/src/api/pack/import/curseforge.rs index aee03f805..9aac5992f 100644 --- a/packages/app-lib/src/api/pack/import/curseforge.rs +++ b/packages/app-lib/src/api/pack/import/curseforge.rs @@ -78,7 +78,7 @@ pub async fn import_curseforge( let icon_bytes = fetch(&thumbnail_url, None, &state.fetch_semaphore, &state.pool) .await?; - let filename = thumbnail_url.rsplit('/').last(); + let filename = thumbnail_url.rsplit('/').next_back(); if let Some(filename) = filename { icon = Some( write_cached_icon( diff --git a/packages/app-lib/src/util/io.rs b/packages/app-lib/src/util/io.rs index 539c0003c..684cc2b9c 100644 --- a/packages/app-lib/src/util/io.rs +++ b/packages/app-lib/src/util/io.rs @@ -139,9 +139,7 @@ pub async fn write( }) }) .await - .map_err(|_| { - std::io::Error::new(std::io::ErrorKind::Other, "background task failed") - })??; + .map_err(|_| std::io::Error::other("background task failed"))??; Ok(()) } @@ -152,8 +150,7 @@ fn sync_write( ) -> Result<(), std::io::Error> { let mut tempfile = NamedTempFile::new_in(path.as_ref().parent().ok_or_else(|| { - std::io::Error::new( - std::io::ErrorKind::Other, + std::io::Error::other( "could not get parent directory for temporary file", ) })?)?;