From 97f4f2581360719d9f904456d2cd0fa79a6b68bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20CORTIER?= Date: Thu, 13 Mar 2025 18:44:40 +0900 Subject: [PATCH] style: run cargo +nightly fmt --- crates/ironrdp-bench/benches/bench.rs | 6 ++---- crates/ironrdp-client/src/config.rs | 7 ++++--- crates/ironrdp-connector/src/connection.rs | 7 ++++--- crates/ironrdp-connector/src/license_exchange.rs | 10 ++++++---- crates/ironrdp-pdu/src/lib.rs | 3 +-- .../src/rdp/server_license/client_license_info.rs | 14 ++++++++------ .../client_platform_challenge_response/test.rs | 5 +++-- crates/ironrdp-svc/src/lib.rs | 3 +-- crates/ironrdp-testsuite-core/tests/pdu/rfx.rs | 3 ++- crates/ironrdp/examples/screenshot.rs | 9 +++++---- crates/ironrdp/examples/server.rs | 3 +-- crates/ironrdp/src/lib.rs | 1 + 12 files changed, 38 insertions(+), 33 deletions(-) diff --git a/crates/ironrdp-bench/benches/bench.rs b/crates/ironrdp-bench/benches/bench.rs index 63f1fa7a..428493c5 100644 --- a/crates/ironrdp-bench/benches/bench.rs +++ b/crates/ironrdp-bench/benches/bench.rs @@ -3,10 +3,8 @@ use std::num::NonZero; use criterion::{criterion_group, criterion_main, Criterion}; use ironrdp_graphics::color_conversion::to_64x64_ycbcr_tile; use ironrdp_pdu::codecs::rfx; -use ironrdp_server::{ - bench::encoder::rfx::{rfx_enc, rfx_enc_tile}, - BitmapUpdate, -}; +use ironrdp_server::bench::encoder::rfx::{rfx_enc, rfx_enc_tile}; +use ironrdp_server::BitmapUpdate; pub fn rfx_enc_tile_bench(c: &mut Criterion) { let quant = rfx::Quant::default(); diff --git a/crates/ironrdp-client/src/config.rs b/crates/ironrdp-client/src/config.rs index 2595d8e0..f0df86f8 100644 --- a/crates/ironrdp-client/src/config.rs +++ b/crates/ironrdp-client/src/config.rs @@ -1,12 +1,13 @@ +use core::num::ParseIntError; +use core::str::FromStr; +use std::io; + use anyhow::Context as _; use clap::clap_derive::ValueEnum; use clap::Parser; -use core::num::ParseIntError; -use core::str::FromStr; use ironrdp::connector::{self, Credentials}; use ironrdp::pdu::rdp::capability_sets::MajorPlatformType; use ironrdp::pdu::rdp::client_info::PerformanceFlags; -use std::io; use tap::prelude::*; const DEFAULT_WIDTH: u16 = 1920; diff --git a/crates/ironrdp-connector/src/connection.rs b/crates/ironrdp-connector/src/connection.rs index ded01ce2..355673b2 100644 --- a/crates/ironrdp-connector/src/connection.rs +++ b/crates/ironrdp-connector/src/connection.rs @@ -1,12 +1,13 @@ use core::mem; +use std::borrow::Cow; +use std::net::SocketAddr; +use std::sync::Arc; + use ironrdp_core::{decode, encode_vec, Encode, WriteBuf}; use ironrdp_pdu::rdp::client_info::{OptionalSystemTime, TimezoneInfo}; use ironrdp_pdu::x224::X224; use ironrdp_pdu::{gcc, mcs, nego, rdp, PduHint}; use ironrdp_svc::{StaticChannelSet, StaticVirtualChannel, SvcClientProcessor}; -use std::borrow::Cow; -use std::net::SocketAddr; -use std::sync::Arc; use crate::channel_connection::{ChannelConnectionSequence, ChannelConnectionState}; use crate::connection_activation::{ConnectionActivationSequence, ConnectionActivationState}; diff --git a/crates/ironrdp-connector/src/license_exchange.rs b/crates/ironrdp-connector/src/license_exchange.rs index 2651ce6e..d90384c7 100644 --- a/crates/ironrdp-connector/src/license_exchange.rs +++ b/crates/ironrdp-connector/src/license_exchange.rs @@ -1,14 +1,16 @@ -use super::{legacy, ConnectorError, ConnectorErrorExt}; -use crate::{encode_send_data_request, ConnectorResult, ConnectorResultExt as _, Sequence, State, Written}; use core::fmt::Debug; use core::panic::RefUnwindSafe; use core::{fmt, mem}; +use std::str; +use std::sync::Arc; + use ironrdp_core::WriteBuf; use ironrdp_pdu::rdp::server_license::{self, LicenseInformation, LicensePdu, ServerLicenseError}; use ironrdp_pdu::PduHint; use rand_core::{OsRng, RngCore as _}; -use std::str; -use std::sync::Arc; + +use super::{legacy, ConnectorError, ConnectorErrorExt}; +use crate::{encode_send_data_request, ConnectorResult, ConnectorResultExt as _, Sequence, State, Written}; #[derive(Default, Debug)] #[non_exhaustive] diff --git a/crates/ironrdp-pdu/src/lib.rs b/crates/ironrdp-pdu/src/lib.rs index 5cf44d91..08204efe 100644 --- a/crates/ironrdp-pdu/src/lib.rs +++ b/crates/ironrdp-pdu/src/lib.rs @@ -228,8 +228,7 @@ pub use ironrdp_core; #[doc(hidden)] #[deprecated(since = "0.1.0", note = "use ironrdp_core::{ReadCursor, WriteCursor}")] pub mod cursor { - pub use ironrdp_core::ReadCursor; - pub use ironrdp_core::WriteCursor; + pub use ironrdp_core::{ReadCursor, WriteCursor}; } #[doc(hidden)] diff --git a/crates/ironrdp-pdu/src/rdp/server_license/client_license_info.rs b/crates/ironrdp-pdu/src/rdp/server_license/client_license_info.rs index d8a610b5..74c519d0 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/client_license_info.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/client_license_info.rs @@ -1,3 +1,11 @@ +use std::io; + +use byteorder::{LittleEndian, WriteBytesExt}; +use ironrdp_core::{ + ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, +}; +use md5::Digest; + use crate::crypto::rc4::Rc4; use crate::crypto::rsa::encrypt_with_public_key; use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags}; @@ -8,12 +16,6 @@ use crate::rdp::server_license::{ PreambleVersion, ServerLicenseError, ServerLicenseRequest, KEY_EXCHANGE_ALGORITHM_RSA, MAC_SIZE, PLATFORM_ID, PREAMBLE_SIZE, RANDOM_NUMBER_SIZE, }; -use byteorder::{LittleEndian, WriteBytesExt}; -use ironrdp_core::{ - ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor, -}; -use md5::Digest; -use std::io; const LICENSE_INFO_STATIC_FIELDS_SIZE: usize = 20; diff --git a/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs b/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs index 4b057bea..881367a8 100644 --- a/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs +++ b/crates/ironrdp-pdu/src/rdp/server_license/client_platform_challenge_response/test.rs @@ -1,10 +1,11 @@ +use ironrdp_core::{decode, encode_vec}; +use lazy_static::lazy_static; + use super::*; use crate::rdp::server_license::{ BasicSecurityHeader, BasicSecurityHeaderFlags, LicenseHeader, LicensePdu, PreambleFlags, PreambleType, PreambleVersion, BASIC_SECURITY_HEADER_SIZE, PREAMBLE_SIZE, }; -use ironrdp_core::{decode, encode_vec}; -use lazy_static::lazy_static; const PLATFORM_CHALLENGE_RESPONSE_DATA_BUFFER: [u8; 18] = [ 0x00, 0x01, // version diff --git a/crates/ironrdp-svc/src/lib.rs b/crates/ironrdp-svc/src/lib.rs index aaa2dec0..58746380 100644 --- a/crates/ironrdp-svc/src/lib.rs +++ b/crates/ironrdp-svc/src/lib.rs @@ -17,8 +17,7 @@ use ironrdp_core::{ assert_obj_safe, decode_cursor, encode_buf, AsAny, DecodeResult, Encode, EncodeResult, ReadCursor, WriteBuf, WriteCursor, }; -use ironrdp_pdu::gcc::ChannelDef; -use ironrdp_pdu::gcc::{ChannelName, ChannelOptions}; +use ironrdp_pdu::gcc::{ChannelDef, ChannelName, ChannelOptions}; use ironrdp_pdu::rdp::vc::ChannelControlFlags; use ironrdp_pdu::x224::X224; use ironrdp_pdu::{decode_err, mcs, PduResult}; diff --git a/crates/ironrdp-testsuite-core/tests/pdu/rfx.rs b/crates/ironrdp-testsuite-core/tests/pdu/rfx.rs index 8c6e5e60..9a8f968b 100644 --- a/crates/ironrdp-testsuite-core/tests/pdu/rfx.rs +++ b/crates/ironrdp-testsuite-core/tests/pdu/rfx.rs @@ -1,4 +1,5 @@ -use ironrdp_pdu::{codecs::rfx::*, decode}; +use ironrdp_pdu::codecs::rfx::*; +use ironrdp_pdu::decode; use ironrdp_testsuite_core::encode_decode_test; const SYNC_PDU_BUFFER: [u8; 12] = [ diff --git a/crates/ironrdp/examples/screenshot.rs b/crates/ironrdp/examples/screenshot.rs index 1e5da29d..3852dd89 100644 --- a/crates/ironrdp/examples/screenshot.rs +++ b/crates/ironrdp/examples/screenshot.rs @@ -20,9 +20,13 @@ #[macro_use] extern crate tracing; +use core::time::Duration; +use std::io::Write as _; +use std::net::TcpStream; +use std::path::PathBuf; + use anyhow::Context as _; use connector::Credentials; -use core::time::Duration; use ironrdp::connector; use ironrdp::connector::ConnectionResult; use ironrdp::pdu::gcc::KeyboardType; @@ -31,9 +35,6 @@ use ironrdp::session::image::DecodedImage; use ironrdp::session::{ActiveStage, ActiveStageOutput}; use ironrdp_pdu::rdp::client_info::PerformanceFlags; use sspi::network_client::reqwest_network_client::ReqwestNetworkClient; -use std::io::Write as _; -use std::net::TcpStream; -use std::path::PathBuf; use tokio_rustls::rustls; const HELP: &str = "\ diff --git a/crates/ironrdp/examples/server.rs b/crates/ironrdp/examples/server.rs index 9a47ad39..7d0453ce 100644 --- a/crates/ironrdp/examples/server.rs +++ b/crates/ironrdp/examples/server.rs @@ -14,8 +14,7 @@ use std::sync::{Arc, Mutex}; use anyhow::Context as _; use ironrdp::cliprdr::backend::{CliprdrBackend, CliprdrBackendFactory}; use ironrdp::connector::DesktopSize; -use ironrdp::rdpsnd::pdu::ClientAudioFormatPdu; -use ironrdp::rdpsnd::pdu::{AudioFormat, WaveFormat}; +use ironrdp::rdpsnd::pdu::{AudioFormat, ClientAudioFormatPdu, WaveFormat}; use ironrdp::rdpsnd::server::{RdpsndServerHandler, RdpsndServerMessage}; use ironrdp::server::tokio::sync::mpsc::UnboundedSender; use ironrdp::server::tokio::time::{self, sleep, Duration}; diff --git a/crates/ironrdp/src/lib.rs b/crates/ironrdp/src/lib.rs index 5caad087..11a3bdd8 100644 --- a/crates/ironrdp/src/lib.rs +++ b/crates/ironrdp/src/lib.rs @@ -1,5 +1,6 @@ #![doc = include_str!("../README.md")] #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")] +#![cfg_attr(rustfmt, rustfmt_skip)] #[cfg(test)] use {