Migrate rustfmt style to 2024 edition

cove-input/src/keys.rs

@@ -3,7 +3,7 @@ use std::num::ParseIntError;
 use std::str::FromStr;
 
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
-use serde::{de::Error, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, de::Error};
 use serde::{Serialize, Serializer};
 use serde_either::SingleOrVec;
 
@@ -117,7 +117,7 @@ impl KeyPress {
             "alt" if !self.alt => self.alt = true,
             "any" if !self.shift && !self.ctrl && !self.alt => self.any = true,
             m @ ("shift" | "ctrl" | "alt" | "any") => {
-                return Err(ParseKeysError::ConflictingModifier(m.to_string()))
+                return Err(ParseKeysError::ConflictingModifier(m.to_string()));
             }
             m => return Err(ParseKeysError::UnknownModifier(m.to_string())),
         }

cove-macro/src/lib.rs

@@ -1,4 +1,4 @@
-use syn::{parse_macro_input, DeriveInput};
+use syn::{DeriveInput, parse_macro_input};
 
 mod document;
 mod key_group;

cove/src/main.rs

@@ -15,8 +15,8 @@ use std::path::PathBuf;
 
 use anyhow::Context;
 use clap::Parser;
-use cove_config::doc::Document;
 use cove_config::Config;
+use cove_config::doc::Document;
 use directories::{BaseDirs, ProjectDirs};
 use log::info;
 use tokio::sync::mpsc;

cove/src/ui/chat.rs

@@ -6,8 +6,8 @@ mod widgets;
 
 use cove_config::Keys;
 use cove_input::InputEvent;
-use jiff::tz::TimeZone;
 use jiff::Timestamp;
+use jiff::tz::TimeZone;
 use toss::widgets::{BoxedAsync, EditorState};
 use toss::{Styled, WidgetExt};
 

cove/src/ui/chat/blocks.rs

@@ -1,6 +1,6 @@
 //! Common rendering logic.
 
-use std::collections::{vec_deque, VecDeque};
+use std::collections::{VecDeque, vec_deque};
 
 use toss::widgets::Predrawn;
 

cove/src/ui/chat/tree.rs

@@ -16,13 +16,13 @@ use toss::widgets::EditorState;
 use toss::{AsyncWidget, Frame, Pos, Size, WidgetExt, WidthDb};
 
 use crate::store::{Msg, MsgStore};
-use crate::ui::{util, ChatMsg, UiError};
+use crate::ui::{ChatMsg, UiError, util};
 use crate::util::InfallibleExt;
 
 use self::renderer::{TreeContext, TreeRenderer};
 
-use super::cursor::Cursor;
 use super::Reaction;
+use super::cursor::Cursor;
 
 pub struct TreeViewState<M: Msg, S: MsgStore<M>> {
     store: S,

cove/src/ui/chat/tree/renderer.rs

@@ -9,10 +9,10 @@ use toss::widgets::{EditorState, Empty, Predrawn, Resize};
 use toss::{Size, Widget, WidthDb};
 
 use crate::store::{Msg, MsgStore, Tree};
+use crate::ui::ChatMsg;
 use crate::ui::chat::blocks::{Block, Blocks, Range};
 use crate::ui::chat::cursor::Cursor;
-use crate::ui::chat::renderer::{self, overlaps, Renderer};
+use crate::ui::chat::renderer::{self, Renderer, overlaps};
-use crate::ui::ChatMsg;
 use crate::util::InfallibleExt;
 
 use super::widgets;

cove/src/ui/chat/tree/scroll.rs

@@ -1,12 +1,12 @@
-use toss::widgets::EditorState;
 use toss::WidthDb;
+use toss::widgets::EditorState;
 
 use crate::store::{Msg, MsgStore};
-use crate::ui::chat::cursor::Cursor;
 use crate::ui::ChatMsg;
+use crate::ui::chat::cursor::Cursor;
 
-use super::renderer::{TreeContext, TreeRenderer};
 use super::TreeViewState;
+use super::renderer::{TreeContext, TreeRenderer};
 
 impl<M, S> TreeViewState<M, S>
 where

cove/src/ui/chat/tree/widgets.rs

@@ -6,8 +6,8 @@ use toss::widgets::{Boxed, EditorState, Join2, Join4, Join5, Text};
 use toss::{Style, Styled, WidgetExt};
 
 use crate::store::Msg;
-use crate::ui::chat::widgets::{Indent, Seen, Time};
 use crate::ui::ChatMsg;
+use crate::ui::chat::widgets::{Indent, Seen, Time};
 use crate::util;
 
 pub const PLACEHOLDER: &str = "[...]";

cove/src/ui/euph/account.rs

@@ -8,7 +8,7 @@ use toss::{Style, Widget, WidgetExt};
 
 use crate::euph::{self, Room};
 use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::ui::{UiError, util};
 
 use super::popup::PopupResult;
 

cove/src/ui/euph/auth.rs

@@ -1,11 +1,11 @@
 use cove_config::Keys;
 use cove_input::InputEvent;
-use toss::widgets::EditorState;
 use toss::Widget;
+use toss::widgets::EditorState;
 
 use crate::euph::Room;
 use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::ui::{UiError, util};
 
 use super::popup::PopupResult;
 

cove/src/ui/euph/inspect.rs

@@ -6,8 +6,8 @@ use euphoxide::conn::SessionInfo;
 use toss::widgets::Text;
 use toss::{Style, Styled, Widget};
 
-use crate::ui::widgets::Popup;
 use crate::ui::UiError;
+use crate::ui::widgets::Popup;
 
 use super::popup::PopupResult;
 

cove/src/ui/euph/links.rs

@@ -7,7 +7,7 @@ use toss::widgets::{Join2, Text};
 use toss::{Style, Styled, Widget, WidgetExt};
 
 use crate::ui::widgets::{ListBuilder, ListState, Popup};
-use crate::ui::{key_bindings, util, UiError};
+use crate::ui::{UiError, key_bindings, util};
 
 use super::popup::PopupResult;
 

cove/src/ui/euph/nick.rs

@@ -6,7 +6,7 @@ use toss::{Style, Widget};
 
 use crate::euph::{self, Room};
 use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::ui::{UiError, util};
 
 use super::popup::PopupResult;
 

cove/src/ui/euph/nick_list.rs

@@ -7,8 +7,8 @@ use toss::widgets::{Background, Text};
 use toss::{Style, Styled, Widget, WidgetExt};
 
 use crate::euph;
-use crate::ui::widgets::{ListBuilder, ListState};
 use crate::ui::UiError;
+use crate::ui::widgets::{ListBuilder, ListState};
 
 pub fn widget<'a>(
     list: &'a mut ListState<SessionId>,

cove/src/ui/euph/popup.rs

@@ -4,8 +4,8 @@ use crossterm::style::Stylize;
 use toss::widgets::Text;
 use toss::{Style, Styled, Widget};
 
-use crate::ui::widgets::Popup;
 use crate::ui::UiError;
+use crate::ui::widgets::Popup;
 
 pub enum RoomPopup {
     Error { description: String, reason: String },

cove/src/ui/euph/room.rs

@@ -16,7 +16,7 @@ use crate::euph;
 use crate::macros::logging_unwrap;
 use crate::ui::chat::{ChatState, Reaction};
 use crate::ui::widgets::ListState;
-use crate::ui::{util, UiError, UiEvent};
+use crate::ui::{UiError, UiEvent, util};
 use crate::vault::EuphRoomVault;
 
 use super::account::AccountUiState;

cove/src/ui/key_bindings.rs

@@ -9,7 +9,7 @@ use toss::widgets::{Either2, Join2, Padding, Text};
 use toss::{Style, Styled, Widget, WidgetExt};
 
 use super::widgets::{ListBuilder, ListState, Popup};
-use super::{util, UiError};
+use super::{UiError, util};
 
 type Line = Either2<Text, Join2<Padding<Text>, Text>>;
 type Builder = ListBuilder<'static, Infallible, Line>;

cove/src/ui/rooms.rs

@@ -28,7 +28,7 @@ use self::delete::{DeleteResult, DeleteState};
 
 use super::euph::room::EuphRoom;
 use super::widgets::{ListBuilder, ListState};
-use super::{key_bindings, util, UiError, UiEvent};
+use super::{UiError, UiEvent, key_bindings, util};
 
 enum State {
     ShowList,

cove/src/ui/rooms/connect.rs

@@ -5,7 +5,7 @@ use toss::widgets::{EditorState, Empty, Join2, Join3, Text};
 use toss::{Style, Styled, Widget, WidgetExt};
 
 use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::ui::{UiError, util};
 use crate::vault::RoomIdentifier;
 
 #[derive(Clone, Copy, PartialEq, Eq)]

cove/src/ui/rooms/delete.rs

@@ -5,7 +5,7 @@ use toss::widgets::{EditorState, Empty, Join2, Text};
 use toss::{Style, Styled, Widget, WidgetExt};
 
 use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::ui::{UiError, util};
 use crate::vault::RoomIdentifier;
 
 pub struct DeleteState {

cove/src/vault.rs

@@ -6,8 +6,8 @@ use std::fs;
 use std::path::Path;
 
 use rusqlite::Connection;
-use vault::tokio::TokioVault;
 use vault::Action;
+use vault::tokio::TokioVault;
 
 pub use self::euph::{EuphRoomVault, EuphVault, RoomIdentifier};
 

cove/src/vault/euph.rs

@@ -5,7 +5,7 @@ use async_trait::async_trait;
 use cookie::{Cookie, CookieJar};
 use euphoxide::api::{Message, MessageId, SessionId, SessionView, Snowflake, Time, UserId};
 use rusqlite::types::{FromSql, FromSqlError, ToSqlOutput, Value, ValueRef};
-use rusqlite::{named_params, params, Connection, OptionalExtension, Row, ToSql, Transaction};
+use rusqlite::{Connection, OptionalExtension, Row, ToSql, Transaction, named_params, params};
 use vault::Action;
 
 use crate::euph::SmallMessage;
@@ -16,7 +16,7 @@ struct WSnowflake(Snowflake);
 
 impl ToSql for WSnowflake {
     fn to_sql(&self) -> rusqlite::Result<ToSqlOutput<'_>> {
-        self.0 .0.to_sql()
+        self.0.0.to_sql()
     }
 }
 
@@ -31,7 +31,7 @@ struct WTime(Time);
 
 impl ToSql for WTime {
     fn to_sql(&self) -> rusqlite::Result<ToSqlOutput<'_>> {
-        let timestamp = self.0 .0;
+        let timestamp = self.0.0;
         Ok(ToSqlOutput::Owned(Value::Integer(timestamp)))
     }
 }

rustfmt.toml

@@ -1 +0,0 @@
-style_edition = "2021"