From a8126ecd3a0e25462bbb5e4bd8b4e6603ab86147 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Thu, 30 Jul 2026 21:03:57 -0400 Subject: [PATCH 1/2] fix(labrinth): return last file if no primary is found --- apps/labrinth/src/routes/maven.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/labrinth/src/routes/maven.rs b/apps/labrinth/src/routes/maven.rs index bc351ccb03..ab78e978b2 100644 --- a/apps/labrinth/src/routes/maven.rs +++ b/apps/labrinth/src/routes/maven.rs @@ -265,8 +265,11 @@ fn find_file<'a>( if file_name.eq_ignore_ascii_case(&formatted_name) { return filtered_files - .find(|x| x.primary) - .or_else(|| filtered_files.next_back()); + .try_fold( + None, + |_, x| if x.primary { Err(x) } else { Ok(Some(x)) }, + ) + .map_or_else(|found| Some(found), |last| last); } else if file_name.len() > formatted_name.len() && file_name.as_bytes()[..formatted_name.len()] .eq_ignore_ascii_case(formatted_name.as_bytes()) From 1587759b685d177c915220cf5e7b4d1d7395edb6 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Thu, 30 Jul 2026 21:06:28 -0400 Subject: [PATCH 2/2] style(labrinth): clippy --- apps/labrinth/src/routes/maven.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/labrinth/src/routes/maven.rs b/apps/labrinth/src/routes/maven.rs index ab78e978b2..bffc95bf95 100644 --- a/apps/labrinth/src/routes/maven.rs +++ b/apps/labrinth/src/routes/maven.rs @@ -269,7 +269,7 @@ fn find_file<'a>( None, |_, x| if x.primary { Err(x) } else { Ok(Some(x)) }, ) - .map_or_else(|found| Some(found), |last| last); + .unwrap_or_else(Some); } else if file_name.len() > formatted_name.len() && file_name.as_bytes()[..formatted_name.len()] .eq_ignore_ascii_case(formatted_name.as_bytes())