chore(multiverse): Upgrade to Rust edition 2024

Author: jplatte

labs/multiverse/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "multiverse"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 

labs/multiverse/src/main.rs

@@ -2,7 +2,7 @@
 
 use std::{
     collections::{HashMap, HashSet},
-    io::{self, stdout, Write},
+    io::{self, Write, stdout},
     path::{Path, PathBuf},
     sync::Arc,
     time::{Duration, Instant},
@@ -16,23 +16,23 @@ use crossterm::{
     },
     execute,
 };
-use futures_util::{pin_mut, StreamExt as _};
+use futures_util::{StreamExt as _, pin_mut};
 use imbl::Vector;
 use layout::Flex;
 use matrix_sdk::{
+    AuthSession, Client, SqliteCryptoStore, SqliteEventCacheStore, SqliteStateStore,
     authentication::matrix::MatrixSession,
     config::StoreConfig,
     encryption::{BackupDownloadStrategy, EncryptionSettings},
     reqwest::Url,
     ruma::OwnedRoomId,
-    AuthSession, Client, SqliteCryptoStore, SqliteEventCacheStore, SqliteStateStore,
 };
 use matrix_sdk_common::locks::Mutex;
 use matrix_sdk_ui::{
+    Timeline as SdkTimeline,
     room_list_service::{self, filters::new_filter_non_left},
     sync_service::SyncService,
     timeline::{RoomExt as _, TimelineFocus, TimelineItem},
-    Timeline as SdkTimeline,
 };
 use ratatui::{prelude::*, style::palette::tailwind, widgets::*};
 use throbber_widgets_tui::{Throbber, ThrobberState};

labs/multiverse/src/widgets/recovery/default.rs

@@ -1,7 +1,7 @@
 use std::{
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
@@ -10,11 +10,11 @@ use crossterm::event::{KeyCode, KeyEvent, KeyEventKind};
 use futures_util::FutureExt as _;
 use layout::Flex;
 use matrix_sdk::{
+    Client,
     encryption::{
         backups::BackupState,
         recovery::{RecoveryError, RecoveryState},
     },
-    Client,
 };
 use matrix_sdk_common::executor::spawn;
 use ratatui::{
@@ -24,7 +24,7 @@ use ratatui::{
 use throbber_widgets_tui::{Throbber, ThrobberState};
 use tokio::task::JoinHandle;
 
-use super::{create_centered_throbber_area, ShouldExit};
+use super::{ShouldExit, create_centered_throbber_area};
 
 #[derive(Debug)]
 pub struct DefaultRecoveryView {

labs/multiverse/src/widgets/recovery/mod.rs

@@ -1,5 +1,5 @@
 use crossterm::event::{KeyCode, KeyEvent};
-use matrix_sdk::{encryption::recovery::RecoveryState, Client};
+use matrix_sdk::{Client, encryption::recovery::RecoveryState};
 use ratatui::prelude::*;
 use recovering::RecoveringView;
 use throbber_widgets_tui::{Throbber, ThrobberState};

labs/multiverse/src/widgets/recovery/recovering.rs

@@ -1,10 +1,10 @@
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 use futures_util::FutureExt as _;
 use matrix_sdk::{
-    encryption::{recovery::RecoveryError, CrossSigningResetAuthType},
+    Client,
+    encryption::{CrossSigningResetAuthType, recovery::RecoveryError},
     reqwest::Url,
     ruma::api::client::uiaa::{AuthData, Password},
-    Client,
 };
 use matrix_sdk_common::executor::spawn;
 use ratatui::{
@@ -14,15 +14,15 @@ use ratatui::{
 use throbber_widgets_tui::{Throbber, ThrobberState};
 use tokio::{
     sync::{
-        mpsc::{unbounded_channel, UnboundedSender},
+        mpsc::{UnboundedSender, unbounded_channel},
         oneshot,
     },
     task::JoinHandle,
 };
 use tui_textarea::TextArea;
 
 use super::ShouldExit;
-use crate::widgets::{recovery::create_centered_throbber_area, Hyperlink};
+use crate::widgets::{Hyperlink, recovery::create_centered_throbber_area};
 
 #[derive(Debug)]
 enum ResetState {

labs/multiverse/src/widgets/room_list.rs

@@ -1,13 +1,13 @@
 use std::{collections::HashMap, sync::Arc};
 
 use imbl::Vector;
-use matrix_sdk::{locks::Mutex, ruma::OwnedRoomId, Client, Room};
+use matrix_sdk::{Client, Room, locks::Mutex, ruma::OwnedRoomId};
 use matrix_sdk_ui::sync_service::SyncService;
 use ratatui::{prelude::*, widgets::*};
 
 use crate::{
-    widgets::status::StatusHandle, ALT_ROW_COLOR, HEADER_BG, NORMAL_ROW_COLOR, SELECTED_STYLE_FG,
-    TEXT_COLOR,
+    ALT_ROW_COLOR, HEADER_BG, NORMAL_ROW_COLOR, SELECTED_STYLE_FG, TEXT_COLOR,
+    widgets::status::StatusHandle,
 };
 
 /// Extra room information, like its display name, etc.

labs/multiverse/src/widgets/room_view/details/read_receipts.rs

@@ -6,7 +6,7 @@ use ratatui::{
     widgets::{Block, Borders, Paragraph, Wrap},
 };
 
-use crate::{widgets::room_view::DetailsState, TEXT_COLOR};
+use crate::{TEXT_COLOR, widgets::room_view::DetailsState};
 
 pub struct ReadReceipts<'a> {
     state: &'a DetailsState<'a>,

labs/multiverse/src/widgets/room_view/invited_room.rs

@@ -1,10 +1,10 @@
 use crossterm::event::{Event, KeyCode, KeyEvent, MouseButton, MouseEvent, MouseEventKind};
 use futures_util::FutureExt;
-use matrix_sdk::{room::Invite, Room, RoomState};
+use matrix_sdk::{Room, RoomState, room::Invite};
 use ratatui::{prelude::*, widgets::*};
 use throbber_widgets_tui::{Throbber, ThrobberState};
 use tokio::{spawn, task::JoinHandle};
-use tui_framework_experiment::{button, Button};
+use tui_framework_experiment::{Button, button};
 
 use crate::widgets::recovery::create_centered_throbber_area;
 

labs/multiverse/src/widgets/room_view/mod.rs

@@ -6,20 +6,20 @@ use imbl::Vector;
 use input::MessageOrCommand;
 use invited_room::InvitedRoomView;
 use matrix_sdk::{
+    Client, Room, RoomState,
     locks::Mutex,
     room::reply::{EnforceThread::Threaded, Reply},
     ruma::{
+        OwnedEventId, OwnedRoomId, RoomId, UserId,
         api::client::receipt::create_receipt::v3::ReceiptType,
         events::room::message::{
             ReplyWithinThread, RoomMessageEventContent, RoomMessageEventContentWithoutRelation,
         },
-        OwnedEventId, OwnedRoomId, RoomId, UserId,
     },
-    Client, Room, RoomState,
 };
 use matrix_sdk_ui::{
-    timeline::{TimelineBuilder, TimelineFocus, TimelineItem},
     Timeline,
+    timeline::{TimelineBuilder, TimelineFocus, TimelineItem},
 };
 use ratatui::{prelude::*, widgets::*};
 use tokio::{spawn, sync::OnceCell, task::JoinHandle};
@@ -28,8 +28,8 @@ use tracing::info;
 use self::{details::RoomDetails, input::Input, timeline::TimelineView};
 use super::status::StatusHandle;
 use crate::{
+    HEADER_BG, NORMAL_ROW_COLOR, TEXT_COLOR, Timelines,
     widgets::{recovery::ShouldExit, room_view::timeline::TimelineListState},
-    Timelines, HEADER_BG, NORMAL_ROW_COLOR, TEXT_COLOR,
 };
 
 mod details;

labs/multiverse/src/widgets/room_view/timeline.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use imbl::Vector;
-use matrix_sdk::ruma::{events::room::message::MessageType, UserId};
+use matrix_sdk::ruma::{UserId, events::room::message::MessageType};
 use matrix_sdk_ui::timeline::{
     MembershipChange, Message, MsgLikeContent, MsgLikeKind, RoomMembershipChange, ThreadSummary,
     TimelineDetails, TimelineItem, TimelineItemContent, TimelineItemKind, VirtualTimelineItem,