From fcc519d25e3bf04126512eab481ed1daf69b4771 Mon Sep 17 00:00:00 2001 From: LynithDev <61880709+LynithDev@users.noreply.github.com> Date: Fri, 10 Jul 2026 20:55:39 +0200 Subject: [PATCH] chore: Fix clippy warnings --- .../src/layout/animated_outlet.rs | 12 +++++---- .../oneclient_app/src/layout/cluster_shell.rs | 25 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/packages/oneclient_app/src/layout/animated_outlet.rs b/packages/oneclient_app/src/layout/animated_outlet.rs index 2e051dce..b900250a 100644 --- a/packages/oneclient_app/src/layout/animated_outlet.rs +++ b/packages/oneclient_app/src/layout/animated_outlet.rs @@ -92,10 +92,8 @@ impl Component for AnimatedAppOutlet { } }); - if anim_finished { - if matches!(&*router.peek(), AnimatedRouterContext::FromTo(_, _)) { - router.write().settle(); - } + if anim_finished && matches!(&*router.peek(), AnimatedRouterContext::FromTo(_, _)) { + router.write().settle(); } let kind = match &*router.read() { @@ -106,7 +104,11 @@ impl Component for AnimatedAppOutlet { let is_home = matches!(to, Route::Home {}); let show_overlay = !hides_overlay(&to); - let p = if anim_finished { 1.0 } else { anim.get().value() }; + let p = if anim_finished { + 1.0 + } else { + anim.get().value() + }; let chrome_opacity = if kind == Enter::Up { p } else { 1.0 }; diff --git a/packages/oneclient_app/src/layout/cluster_shell.rs b/packages/oneclient_app/src/layout/cluster_shell.rs index cd614ecf..5f7e3f1a 100644 --- a/packages/oneclient_app/src/layout/cluster_shell.rs +++ b/packages/oneclient_app/src/layout/cluster_shell.rs @@ -7,10 +7,10 @@ use oneclient_core::parse_mc_version; use crate::components::{Button, Icon, IconType, TabBar, TabItem}; use crate::hooks::{use_clusters, use_dispatch, use_game_snapshot, use_version_metadata}; -use crate::view::app::launch_button_state; use crate::routes::Route; use crate::theme::colors; use crate::ui::entrance_motion_layer; +use crate::view::app::launch_button_state; const HEADER_HEIGHT: f32 = 64.; const TABS_HEIGHT: f32 = 44.; @@ -80,9 +80,7 @@ fn route_cluster(route: &Route) -> Option<(i64, ClusterViewShellTab)> { Route::ClusterOverview { cluster_id } => (*cluster_id, ClusterViewShellTab::Overview), Route::ClusterLogs { cluster_id } => (*cluster_id, ClusterViewShellTab::Logs), Route::ProcessLogs { cluster_id } => (*cluster_id, ClusterViewShellTab::GameLog), - Route::ClusterScreenshots { cluster_id } => { - (*cluster_id, ClusterViewShellTab::Screenshots) - } + Route::ClusterScreenshots { cluster_id } => (*cluster_id, ClusterViewShellTab::Screenshots), Route::ClusterMods { cluster_id } => (*cluster_id, ClusterViewShellTab::Mods), Route::ClusterShaders { cluster_id } => (*cluster_id, ClusterViewShellTab::Shaders), Route::ClusterTextures { cluster_id } => (*cluster_id, ClusterViewShellTab::Textures), @@ -152,7 +150,12 @@ impl Component for ClusterShell { rect() .vertical() .width(Size::fill()) - .padding(Gaps::new(BAR_SPACING, SIDE_PADDING, BAR_SPACING, SIDE_PADDING)) + .padding(Gaps::new( + BAR_SPACING, + SIDE_PADDING, + BAR_SPACING, + SIDE_PADDING, + )) .spacing(BAR_SPACING) .maybe_child(header) .child(cluster_tabs(active_tab, cluster_id, show_game_log)), @@ -210,14 +213,16 @@ impl Component for ClusterContentOutlet { } }); - if anim_finished { - if matches!(&*router.peek(), AnimatedRouterContext::FromTo(_, _)) { - router.write().settle(); - } + if anim_finished && matches!(&*router.peek(), AnimatedRouterContext::FromTo(_, _)) { + router.write().settle(); } const CONTENT_DX: f32 = 44.; - let p = if anim_finished { 1.0 } else { anim.get().value() }; + let p = if anim_finished { + 1.0 + } else { + anim.get().value() + }; let slide_x = if anim_finished || dir == 0. { 0. } else {