chore: upgrade toolchain to 1.89.0 and migrate to Rust edition 2024 (#1153)

- Bump pinned toolchain from 1.88.0 to 1.89.0 in rust-toolchain.toml
- Migrate all workspace crates from edition 2021 to edition 2024
- Run `cargo fix --edition` to auto-migrate source code for edition 2024
compatibility (unsafe in unsafe fn, tail expr drop order, etc.)
- Replace all `expr_2021` macro fragment specifiers with `expr` now that
the workspace is fully on edition 2024
- Remove `keyword_idents_2024` lint (now enforced by the edition itself)
- Remove removed `clippy::string_to_string` lint (covered by
implicit_clone)
- Fix new clippy lints from 1.93.0: `manual_is_multiple_of`,
`useless_let_if_seq`, `manual_map`, `derivable_impls`,
`redundant_imports`, `unused_crate_dependencies` (but didn’t bump MSRV)
- Drop `core::future::Future` unnecessary qualifications (Future is now
in the Rust 2024 prelude)
- Remove direct `bytes` deps from ironrdp-futures and ironrdp-tokio
(re-exported by ironrdp-async)

Author: CBenoit

AGENTS.md

@@ -127,8 +127,8 @@ Do not modify them unless specifically working on fixing their compilation.
 
 ## Coding Standards (The "Gold Standard")
 
-- **Language:** Rust (Edition 2021; toolchain pinned via `rust-toolchain.toml`)
-- **Toolchain baseline:** Rust `1.88.0`
+- **Language:** Rust (Edition 2024; toolchain pinned via `rust-toolchain.toml`)
+- **Toolchain baseline:** Rust `1.89.0`
 - **Formatter:** `rustfmt` (workspace config in `rustfmt.toml`)
 - **Lints:** Strict workspace lint policy (`[workspace.lints.rust]` and `[workspace.lints.clippy]` in root `Cargo.toml`)
 - **Error handling:** Prefer explicit, composable error messages following `STYLE.md`

Cargo.lock

@@ -15,7 +15,7 @@ exclude = [
 ]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/Devolutions/IronRDP"
 repository = "https://github.com/Devolutions/IronRDP"
@@ -53,7 +53,6 @@ unsafe_attr_outside_unsafe = "warn"
 
 # == Correctness == #
 ambiguous_negative_literals  = "warn"
-keyword_idents_2024 = "warn" # FIXME: remove when switched to 2024 edition
 
 # == Style, readability == #
 elided_lifetimes_in_paths = "warn" # https://quinedot.github.io/rust-learning/dont-hide.html
@@ -134,7 +133,6 @@ checked_conversions = "warn"
 get_unwrap = "warn"
 similar_names = "warn" # Reduce risk of confusing similar names together, and protects against typos when variable shadowing was intended.
 str_to_string = "warn"
-string_to_string = "warn"
 std_instead_of_core = "warn"
 separated_literal_suffix = "warn"
 unused_self = "warn"

Cargo.toml

@@ -157,8 +157,8 @@ impl RdpServerDisplayUpdates for DisplayUpdates {
 
 fn setup_logging() -> anyhow::Result<()> {
     use tracing::metadata::LevelFilter;
-    use tracing_subscriber::prelude::*;
     use tracing_subscriber::EnvFilter;
+    use tracing_subscriber::prelude::*;
 
     let fmt_layer = tracing_subscriber::fmt::layer().compact();
 
@@ -176,7 +176,9 @@ fn setup_logging() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[derive(Default)]
 enum OptCodec {
+    #[default]
     RemoteFX,
     Bitmap,
     None,
@@ -186,12 +188,6 @@ enum OptCodec {
     QoiZ,
 }
 
-impl Default for OptCodec {
-    fn default() -> Self {
-        Self::RemoteFX
-    }
-}
-
 impl core::str::FromStr for OptCodec {
     type Err = anyhow::Error;
 

benches/src/perfenc.rs

@@ -1,5 +1,5 @@
-use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen::JsValue;
+use wasm_bindgen::prelude::wasm_bindgen;
 
 #[macro_export]
 macro_rules! extension_match {

crates/iron-remote-desktop/src/extension.rs

@@ -1,5 +1,5 @@
 use wasm_bindgen::JsValue;
-use web_sys::{js_sys, HtmlCanvasElement};
+use web_sys::{HtmlCanvasElement, js_sys};
 
 use crate::clipboard::ClipboardData;
 use crate::error::IronError;
@@ -64,7 +64,7 @@ pub trait Session {
     type ClipboardData: ClipboardData;
     type Error: IronError;
 
-    fn run(&self) -> impl core::future::Future<Output = Result<Self::SessionTerminationInfo, Self::Error>>;
+    fn run(&self) -> impl Future<Output = Result<Self::SessionTerminationInfo, Self::Error>>;
 
     fn desktop_size(&self) -> DesktopSize;
 
@@ -82,10 +82,7 @@ pub trait Session {
 
     fn shutdown(&self) -> Result<(), Self::Error>;
 
-    fn on_clipboard_paste(
-        &self,
-        content: &Self::ClipboardData,
-    ) -> impl core::future::Future<Output = Result<(), Self::Error>>;
+    fn on_clipboard_paste(&self, content: &Self::ClipboardData) -> impl Future<Output = Result<(), Self::Error>>;
 
     fn resize(
         &self,

crates/iron-remote-desktop/src/session.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use ironrdp_connector::{
-    reason_err, ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written,
+    ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written, reason_err,
 };
 use ironrdp_core::WriteBuf;
 use ironrdp_pdu::mcs;

crates/ironrdp-acceptor/src/channel_connection.rs

@@ -1,10 +1,10 @@
 use core::mem;
 
 use ironrdp_connector::{
-    encode_x224_packet, general_err, reason_err, ConnectorError, ConnectorErrorExt as _, ConnectorResult, DesktopSize,
-    Sequence, State, Written,
+    ConnectorError, ConnectorErrorExt as _, ConnectorResult, DesktopSize, Sequence, State, Written, encode_x224_packet,
+    general_err, reason_err,
 };
-use ironrdp_core::{decode, WriteBuf};
+use ironrdp_core::{WriteBuf, decode};
 use ironrdp_pdu as pdu;
 use ironrdp_pdu::nego::SecurityProtocol;
 use ironrdp_pdu::x224::X224;
@@ -715,7 +715,7 @@ impl Sequence for Acceptor {
                     }
 
                     mcs::McsMessage::DisconnectProviderUltimatum(ultimatum) => {
-                        return Err(reason_err!("received disconnect ultimatum", "{:?}", ultimatum.reason))
+                        return Err(reason_err!("received disconnect ultimatum", "{:?}", ultimatum.reason));
                     }
 
                     _ => {

crates/ironrdp-acceptor/src/connection.rs

@@ -6,9 +6,9 @@ use ironrdp_connector::sspi::generator::{Generator, GeneratorState};
 use ironrdp_connector::sspi::negotiate::ProtocolConfig;
 use ironrdp_connector::sspi::{self, AuthIdentity, KerberosServerConfig, NegotiateConfig, NetworkRequest, Username};
 use ironrdp_connector::{
-    custom_err, general_err, ConnectorError, ConnectorErrorKind, ConnectorResult, ServerName, Written,
+    ConnectorError, ConnectorErrorKind, ConnectorResult, ServerName, Written, custom_err, general_err,
 };
-use ironrdp_core::{other_err, WriteBuf};
+use ironrdp_core::{WriteBuf, other_err};
 use ironrdp_pdu::PduHint;
 use tracing::debug;
 

crates/ironrdp-acceptor/src/credssp.rs

@@ -1,10 +1,10 @@
 #![cfg_attr(doc, doc = include_str!("../README.md"))]
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 
-use ironrdp_async::{single_sequence_step, Framed, FramedRead, FramedWrite, NetworkClient, StreamWrapper};
+use ironrdp_async::{Framed, FramedRead, FramedWrite, NetworkClient, StreamWrapper, single_sequence_step};
 use ironrdp_connector::sspi::credssp::EarlyUserAuthResult;
 use ironrdp_connector::sspi::{AuthIdentity, KerberosServerConfig, Username};
-use ironrdp_connector::{custom_err, general_err, ConnectorResult, ServerName};
+use ironrdp_connector::{ConnectorResult, ServerName, custom_err, general_err};
 use ironrdp_core::WriteBuf;
 use tracing::{debug, instrument, trace};