From a16fe962b12a2ad35fedeee6d8535e098d1aab38 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 24 Jan 2024 20:02:30 +0000 Subject: [PATCH] Another run of 'cargo fmt'. Sooner or later I'm going to have to start automating this. Otherwise there will be too many random formatting changes mixed in to every other patch I make. --- src/file.rs | 2 +- src/menu.rs | 2 +- src/tui.rs | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/file.rs b/src/file.rs index 46b5700..a525e09 100644 --- a/src/file.rs +++ b/src/file.rs @@ -6,7 +6,7 @@ use std::collections::{hash_map, HashMap, HashSet}; use std::rc::Rc; use super::activity_stack::{ - NonUtilityActivity, OverlayActivity, UtilityActivity, ComposeActivity, + ComposeActivity, NonUtilityActivity, OverlayActivity, UtilityActivity, }; use super::client::{ Boosts, Client, ClientError, FeedExtend, FeedId, Replies, diff --git a/src/menu.rs b/src/menu.rs index 409e364..5a185b6 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -2,7 +2,7 @@ use itertools::Itertools; use std::collections::HashMap; use super::activity_stack::{ - NonUtilityActivity, OverlayActivity, UtilityActivity, ComposeActivity, + ComposeActivity, NonUtilityActivity, OverlayActivity, UtilityActivity, }; use super::client::Client; use super::coloured_string::ColouredString; diff --git a/src/tui.rs b/src/tui.rs index 467a8d9..83bfe20 100644 --- a/src/tui.rs +++ b/src/tui.rs @@ -778,12 +778,12 @@ impl TuiLogicalState { LogicalAction::Error(_) => break PhysicalAction::Beep, // FIXME: Error Log LogicalAction::PostComposed(post) => { let newact = match self.activity_stack.top() { - Activity::Compose(ComposeActivity::ComposeToplevel) => { - ComposeActivity::PostComposeMenu.into() - } - Activity::Compose(ComposeActivity::ComposeReply(id)) => { - ComposeActivity::PostReplyMenu(id).into() - } + Activity::Compose( + ComposeActivity::ComposeToplevel, + ) => ComposeActivity::PostComposeMenu.into(), + Activity::Compose(ComposeActivity::ComposeReply( + id, + )) => ComposeActivity::PostReplyMenu(id).into(), act => panic!("can't postcompose {act:?}"), }; self.activity_stack.chain_to(newact); @@ -792,12 +792,12 @@ impl TuiLogicalState { } LogicalAction::PostReEdit(post) => { let newact = match self.activity_stack.top() { - Activity::Compose(ComposeActivity::PostComposeMenu) => { - ComposeActivity::ComposeToplevel.into() - } - Activity::Compose(ComposeActivity::PostReplyMenu(id)) => { - ComposeActivity::ComposeReply(id).into() - } + Activity::Compose( + ComposeActivity::PostComposeMenu, + ) => ComposeActivity::ComposeToplevel.into(), + Activity::Compose(ComposeActivity::PostReplyMenu( + id, + )) => ComposeActivity::ComposeReply(id).into(), act => panic!("can't reedit {act:?}"), }; self.activity_stack.chain_to(newact); @@ -1012,9 +1012,9 @@ impl TuiLogicalState { compose_post(client, post) })( ), - Activity::Compose(ComposeActivity::PostComposeMenu) => Ok(post_menu( - post.expect("how did we get here without a Post?"), - )), + Activity::Compose(ComposeActivity::PostComposeMenu) => Ok( + post_menu(post.expect("how did we get here without a Post?")), + ), Activity::Compose(ComposeActivity::ComposeReply(ref id)) => { let post = match post { Some(post) => Ok(post), -- 2.30.2