From 64535c5559263d9fa7b6ef23c36cb0a44afd217b Mon Sep 17 00:00:00 2001 From: Alex Yusiuk <55661041+RRRadicalEdward@users.noreply.github.com> Date: Mon, 18 Aug 2025 20:49:02 +0300 Subject: [PATCH] refactor: add wildcard_imports clippy extra-pedantic lint (#902) --- Cargo.toml | 1 + crates/ironrdp-cliprdr-native/src/windows.rs | 2 +- crates/ironrdp-connector/src/connection.rs | 6 +++++- .../src/connection_activation.rs | 9 ++++++++- crates/ironrdp-fuzzing/src/oracles/mod.rs | 12 ++++++------ crates/ironrdp-pdu/src/geometry.rs | 2 +- crates/ironrdp-pdu/src/mcs.rs | 5 ++++- crates/ironrdp-pdu/src/rdp/client_info.rs | 2 +- crates/ironrdp-server/src/builder.rs | 2 +- crates/ironrdp-testsuite-core/src/capsets.rs | 4 +++- crates/ironrdp-testsuite-core/src/client_info.rs | 6 +++++- .../src/conference_create.rs | 2 +- crates/ironrdp-testsuite-core/src/core_data.rs | 6 +++++- crates/ironrdp-testsuite-core/src/gcc.rs | 2 +- crates/ironrdp-testsuite-core/src/gfx.rs | 2 +- .../src/graphics_messages.rs | 9 ++++++++- crates/ironrdp-testsuite-core/src/mcs.rs | 6 +++++- .../ironrdp-testsuite-core/src/monitor_data.rs | 2 +- .../src/monitor_extended_data.rs | 2 +- .../ironrdp-testsuite-core/src/network_data.rs | 2 +- crates/ironrdp-testsuite-core/src/rdp.rs | 16 ++++++++++++---- .../ironrdp-testsuite-core/src/security_data.rs | 2 +- 22 files changed, 73 insertions(+), 29 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5d6bb59a..db9cc0d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -144,6 +144,7 @@ alloc_instead_of_core = "warn" empty_drop = "warn" return_self_not_must_use = "warn" wildcard_dependencies = "warn" +wildcard_imports = "warn" # == Let’s not merge unintended eprint!/print! statements in libraries == # print_stderr = "warn" diff --git a/crates/ironrdp-cliprdr-native/src/windows.rs b/crates/ironrdp-cliprdr-native/src/windows.rs index 0d9fb995..7673e7fe 100644 --- a/crates/ironrdp-cliprdr-native/src/windows.rs +++ b/crates/ironrdp-cliprdr-native/src/windows.rs @@ -14,7 +14,7 @@ use ironrdp_cliprdr::pdu::{ use tracing::error; use windows::core::{s, Error}; pub use windows::Win32::Foundation::HWND; -use windows::Win32::Foundation::*; +use windows::Win32::Foundation::{FALSE, LPARAM, LRESULT, WPARAM}; use windows::Win32::System::DataExchange::{AddClipboardFormatListener, RemoveClipboardFormatListener}; use windows::Win32::System::LibraryLoader::GetModuleHandleA; use windows::Win32::UI::Shell::{RemoveWindowSubclass, SetWindowSubclass}; diff --git a/crates/ironrdp-connector/src/connection.rs b/crates/ironrdp-connector/src/connection.rs index fb4ffcc1..8cf14883 100644 --- a/crates/ironrdp-connector/src/connection.rs +++ b/crates/ironrdp-connector/src/connection.rs @@ -609,7 +609,11 @@ fn create_gcc_blocks<'a>( selected_protocol: nego::SecurityProtocol, static_channels: impl Iterator, ) -> gcc::ClientGccBlocks { - use ironrdp_pdu::gcc::*; + use ironrdp_pdu::gcc::{ + ClientCoreData, ClientCoreOptionalData, ClientEarlyCapabilityFlags, ClientGccBlocks, ClientNetworkData, + ClientSecurityData, ColorDepth, ConnectionType, EncryptionMethod, HighColorDepth, MonitorOrientation, + RdpVersion, SecureAccessSequence, SupportedColorDepths, + }; let max_color_depth = config.bitmap.as_ref().map(|bitmap| bitmap.color_depth).unwrap_or(32); diff --git a/crates/ironrdp-connector/src/connection_activation.rs b/crates/ironrdp-connector/src/connection_activation.rs index b29585bf..309dfc34 100644 --- a/crates/ironrdp-connector/src/connection_activation.rs +++ b/crates/ironrdp-connector/src/connection_activation.rs @@ -261,7 +261,14 @@ fn create_client_confirm_active( mut server_capability_sets: Vec, desktop_size: DesktopSize, ) -> rdp::capability_sets::ClientConfirmActive { - use ironrdp_pdu::rdp::capability_sets::*; + use ironrdp_pdu::rdp::capability_sets::{ + client_codecs_capabilities, Bitmap, BitmapCache, BitmapDrawingFlags, Brush, CacheDefinition, CacheEntry, + CapabilitySet, ClientConfirmActive, CmdFlags, DemandActive, FrameAcknowledge, General, GeneralExtraFlags, + GlyphCache, GlyphSupportLevel, Input, InputFlags, LargePointer, LargePointerSupportFlags, MultifragmentUpdate, + OffscreenBitmapCache, Order, OrderFlags, OrderSupportExFlags, Pointer, Sound, SoundFlags, SupportLevel, + SurfaceCommands, VirtualChannel, VirtualChannelFlags, BITMAP_CACHE_ENTRIES_NUM, GLYPH_CACHE_NUM, + SERVER_CHANNEL_ID, + }; server_capability_sets.retain(|capability_set| matches!(capability_set, CapabilitySet::MultiFragmentUpdate(_))); diff --git a/crates/ironrdp-fuzzing/src/oracles/mod.rs b/crates/ironrdp-fuzzing/src/oracles/mod.rs index 686d9eb0..796cd38e 100644 --- a/crates/ironrdp-fuzzing/src/oracles/mod.rs +++ b/crates/ironrdp-fuzzing/src/oracles/mod.rs @@ -13,12 +13,12 @@ use crate::generators::BitmapInput; pub fn pdu_decode(data: &[u8]) { - use ironrdp_core::*; - use ironrdp_pdu::mcs::*; - use ironrdp_pdu::nego::*; - use ironrdp_pdu::rdp::*; - use ironrdp_pdu::x224::*; - use ironrdp_pdu::*; + use ironrdp_core::decode; + use ironrdp_pdu::mcs::{ConnectInitial, ConnectResponse, McsMessage}; + use ironrdp_pdu::nego::{ConnectionConfirm, ConnectionRequest}; + use ironrdp_pdu::rdp::{capability_sets, headers, server_error_info, server_license, vc, ClientInfoPdu}; + use ironrdp_pdu::x224::X224; + use ironrdp_pdu::{bitmap, codecs, fast_path, gcc, input, ironrdp_core, pcb, surface_commands}; let _ = decode::>(data); let _ = decode::>(data); diff --git a/crates/ironrdp-pdu/src/geometry.rs b/crates/ironrdp-pdu/src/geometry.rs index eb6f251d..094619d8 100644 --- a/crates/ironrdp-pdu/src/geometry.rs +++ b/crates/ironrdp-pdu/src/geometry.rs @@ -32,7 +32,7 @@ pub(crate) mod private { } } -use private::*; +use private::{BaseRectangle, RectangleImpl}; pub trait Rectangle: RectangleImpl { fn width(&self) -> u16; diff --git a/crates/ironrdp-pdu/src/mcs.rs b/crates/ironrdp-pdu/src/mcs.rs index 799a2908..0cdabdc6 100644 --- a/crates/ironrdp-pdu/src/mcs.rs +++ b/crates/ironrdp-pdu/src/mcs.rs @@ -942,7 +942,10 @@ mod legacy { use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult}; use thiserror::Error; - use super::*; + use super::{ + cast_length, ensure_size, ConnectInitial, ConnectResponse, DomainParameters, PduError, ReadCursor, WriteCursor, + RESULT_ENUM_LENGTH, + }; use crate::ber; use crate::gcc::conference_create::{ConferenceCreateRequest, ConferenceCreateResponse}; use crate::gcc::GccError; diff --git a/crates/ironrdp-pdu/src/rdp/client_info.rs b/crates/ironrdp-pdu/src/rdp/client_info.rs index 00d0be19..0e2ca6ce 100644 --- a/crates/ironrdp-pdu/src/rdp/client_info.rs +++ b/crates/ironrdp-pdu/src/rdp/client_info.rs @@ -714,7 +714,7 @@ fn string_len(value: &str, character_set: CharacterSet) -> u16 { pub mod builder { use core::marker::PhantomData; - use super::*; + use super::{ExtendedClientOptionalInfo, PerformanceFlags, TimezoneInfo, RECONNECT_COOKIE_LEN}; pub struct ExtendedClientOptionalInfoBuilderStateSetTimeZone; pub struct ExtendedClientOptionalInfoBuilderStateSetSessionId; diff --git a/crates/ironrdp-server/src/builder.rs b/crates/ironrdp-server/src/builder.rs index c8e7b9e2..4d437367 100644 --- a/crates/ironrdp-server/src/builder.rs +++ b/crates/ironrdp-server/src/builder.rs @@ -7,7 +7,7 @@ use tokio_rustls::TlsAcceptor; use super::clipboard::CliprdrServerFactory; use super::display::{DesktopSize, RdpServerDisplay}; use super::handler::{KeyboardEvent, MouseEvent, RdpServerInputHandler}; -use super::server::*; +use super::server::{RdpServer, RdpServerOptions, RdpServerSecurity}; use crate::{DisplayUpdate, RdpServerDisplayUpdates, SoundServerFactory}; pub struct WantsAddr {} diff --git a/crates/ironrdp-testsuite-core/src/capsets.rs b/crates/ironrdp-testsuite-core/src/capsets.rs index e04490cc..c5f6aa43 100644 --- a/crates/ironrdp-testsuite-core/src/capsets.rs +++ b/crates/ironrdp-testsuite-core/src/capsets.rs @@ -1,5 +1,7 @@ use ironrdp_core::decode; -use ironrdp_pdu::rdp::capability_sets::*; +use ironrdp_pdu::rdp::capability_sets::{ + CapabilitySet, ClientConfirmActive, DemandActive, ServerDemandActive, SERVER_CHANNEL_ID, +}; pub const SERVER_DEMAND_ACTIVE_BUFFER: [u8; 357] = [ 0x04, 0x00, // source descriptor length diff --git a/crates/ironrdp-testsuite-core/src/client_info.rs b/crates/ironrdp-testsuite-core/src/client_info.rs index 7acd1776..708ab626 100644 --- a/crates/ironrdp-testsuite-core/src/client_info.rs +++ b/crates/ironrdp-testsuite-core/src/client_info.rs @@ -1,4 +1,8 @@ -use ironrdp_pdu::rdp::client_info::*; +use ironrdp_pdu::rdp::client_info::{ + AddressFamily, ClientInfo, ClientInfoFlags, CompressionType, Credentials, DayOfWeek, DayOfWeekOccurrence, + ExtendedClientInfo, ExtendedClientOptionalInfo, Month, OptionalSystemTime, PerformanceFlags, SystemTime, + TimezoneInfo, +}; pub const CLIENT_INFO_BUFFER_UNICODE_WITHOUT_OPTIONAL_FIELDS_LEN: usize = 218; diff --git a/crates/ironrdp-testsuite-core/src/conference_create.rs b/crates/ironrdp-testsuite-core/src/conference_create.rs index 7d24bb86..ce8fbfb2 100644 --- a/crates/ironrdp-testsuite-core/src/conference_create.rs +++ b/crates/ironrdp-testsuite-core/src/conference_create.rs @@ -1,4 +1,4 @@ -use ironrdp_pdu::gcc::*; +use ironrdp_pdu::gcc::{ConferenceCreateRequest, ConferenceCreateResponse}; use crate::gcc; diff --git a/crates/ironrdp-testsuite-core/src/core_data.rs b/crates/ironrdp-testsuite-core/src/core_data.rs index 606c5b03..629064dc 100644 --- a/crates/ironrdp-testsuite-core/src/core_data.rs +++ b/crates/ironrdp-testsuite-core/src/core_data.rs @@ -1,4 +1,8 @@ -use ironrdp_pdu::gcc::*; +use ironrdp_pdu::gcc::{ + ClientCoreData, ClientCoreOptionalData, ClientEarlyCapabilityFlags, ColorDepth, ConnectionType, HighColorDepth, + KeyboardType, RdpVersion, SecureAccessSequence, ServerCoreData, ServerCoreOptionalData, ServerEarlyCapabilityFlags, + SupportedColorDepths, +}; use ironrdp_pdu::nego::SecurityProtocol; pub const CLIENT_CORE_DATA_BUFFER: [u8; 128] = [ diff --git a/crates/ironrdp-testsuite-core/src/gcc.rs b/crates/ironrdp-testsuite-core/src/gcc.rs index b2a60abb..ccb03799 100644 --- a/crates/ironrdp-testsuite-core/src/gcc.rs +++ b/crates/ironrdp-testsuite-core/src/gcc.rs @@ -1,4 +1,4 @@ -use ironrdp_pdu::gcc::*; +use ironrdp_pdu::gcc::{ClientGccBlocks, ClientGccType, ServerGccBlocks, ServerGccType}; use crate::cluster_data::{CLUSTER_DATA, CLUSTER_DATA_BUFFER}; use crate::core_data::{ diff --git a/crates/ironrdp-testsuite-core/src/gfx.rs b/crates/ironrdp-testsuite-core/src/gfx.rs index d62d8f08..dcad1e9d 100644 --- a/crates/ironrdp-testsuite-core/src/gfx.rs +++ b/crates/ironrdp-testsuite-core/src/gfx.rs @@ -1,4 +1,4 @@ -use ironrdp_pdu::rdp::vc::dvc::gfx::*; +use ironrdp_pdu::rdp::vc::dvc::gfx::{ClientPdu, ServerPdu}; use crate::graphics_messages::{ FRAME_ACKNOWLEDGE, FRAME_ACKNOWLEDGE_BUFFER, WIRE_TO_SURFACE_1, WIRE_TO_SURFACE_1_BUFFER, diff --git a/crates/ironrdp-testsuite-core/src/graphics_messages.rs b/crates/ironrdp-testsuite-core/src/graphics_messages.rs index a7292aa1..6a9f8fe5 100644 --- a/crates/ironrdp-testsuite-core/src/graphics_messages.rs +++ b/crates/ironrdp-testsuite-core/src/graphics_messages.rs @@ -1,6 +1,13 @@ use ironrdp_pdu::gcc::{Monitor, MonitorFlags}; use ironrdp_pdu::geometry::InclusiveRectangle; -use ironrdp_pdu::rdp::vc::dvc::gfx::*; +use ironrdp_pdu::rdp::vc::dvc::gfx::{ + Avc420BitmapStream, Avc444BitmapStream, CacheImportReplyPdu, CacheToSurfacePdu, CapabilitiesAdvertisePdu, + CapabilitiesConfirmPdu, CapabilitiesV103Flags, CapabilitiesV104Flags, CapabilitiesV10Flags, CapabilitiesV81Flags, + CapabilitiesV8Flags, CapabilitySet, Codec1Type, Codec2Type, Color, CreateSurfacePdu, DeleteEncodingContextPdu, + DeleteSurfacePdu, Encoding, EndFramePdu, EvictCacheEntryPdu, FrameAcknowledgePdu, MapSurfaceToOutputPdu, + PixelFormat, Point, QuantQuality, QueueDepth, ResetGraphicsPdu, SolidFillPdu, StartFramePdu, SurfaceToCachePdu, + SurfaceToSurfacePdu, Timestamp, WireToSurface1Pdu, WireToSurface2Pdu, +}; pub const WIRE_TO_SURFACE_1_BUFFER: [u8; 218] = [ 0x00, 0x00, 0x08, 0x00, 0x20, 0xa5, 0x03, 0xde, 0x02, 0xab, 0x03, 0xe7, 0x02, 0xc9, 0x00, 0x00, 0x00, 0x01, 0x0e, diff --git a/crates/ironrdp-testsuite-core/src/mcs.rs b/crates/ironrdp-testsuite-core/src/mcs.rs index 5994acaa..02a715ef 100644 --- a/crates/ironrdp-testsuite-core/src/mcs.rs +++ b/crates/ironrdp-testsuite-core/src/mcs.rs @@ -1,6 +1,10 @@ use std::borrow::Cow; -use ironrdp_pdu::mcs::*; +use ironrdp_pdu::mcs::{ + AttachUserConfirm, AttachUserRequest, ChannelJoinConfirm, ChannelJoinRequest, ConnectInitial, ConnectResponse, + DisconnectProviderUltimatum, DisconnectReason, DomainParameters, ErectDomainPdu, OwnedSendDataIndication, + OwnedSendDataRequest, SendDataIndication, SendDataRequest, +}; use crate::conference_create::{ CONFERENCE_CREATE_REQUEST, CONFERENCE_CREATE_REQUEST_BUFFER, CONFERENCE_CREATE_RESPONSE, diff --git a/crates/ironrdp-testsuite-core/src/monitor_data.rs b/crates/ironrdp-testsuite-core/src/monitor_data.rs index a12460d4..53ee5d32 100644 --- a/crates/ironrdp-testsuite-core/src/monitor_data.rs +++ b/crates/ironrdp-testsuite-core/src/monitor_data.rs @@ -1,4 +1,4 @@ -use ironrdp_pdu::gcc::*; +use ironrdp_pdu::gcc::{ClientMonitorData, Monitor, MonitorFlags}; pub const MONITOR_DATA_WITHOUT_MONITORS_BUFFER: [u8; 8] = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]; diff --git a/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs b/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs index 5fc6c8fb..41ee4b7c 100644 --- a/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs +++ b/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs @@ -1,4 +1,4 @@ -use ironrdp_pdu::gcc::*; +use ironrdp_pdu::gcc::{ClientMonitorExtendedData, ExtendedMonitorInfo, MonitorOrientation}; pub const MONITOR_DATA_WITHOUT_MONITORS_BUFFER: [u8; 12] = [0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]; diff --git a/crates/ironrdp-testsuite-core/src/network_data.rs b/crates/ironrdp-testsuite-core/src/network_data.rs index 5340e915..a5de72d2 100644 --- a/crates/ironrdp-testsuite-core/src/network_data.rs +++ b/crates/ironrdp-testsuite-core/src/network_data.rs @@ -1,4 +1,4 @@ -use ironrdp_pdu::gcc::*; +use ironrdp_pdu::gcc::{ChannelDef, ChannelName, ChannelOptions, ClientNetworkData, ServerNetworkData}; pub const CLIENT_NETWORK_DATA_WITH_CHANNELS_BUFFER: [u8; 40] = [ 0x03, 0x00, 0x00, 0x00, // channels count diff --git a/crates/ironrdp-testsuite-core/src/rdp.rs b/crates/ironrdp-testsuite-core/src/rdp.rs index c86c2db2..856787e2 100644 --- a/crates/ironrdp-testsuite-core/src/rdp.rs +++ b/crates/ironrdp-testsuite-core/src/rdp.rs @@ -1,8 +1,16 @@ use ironrdp_pdu::gcc; -use ironrdp_pdu::rdp::finalization_messages::*; -use ironrdp_pdu::rdp::headers::*; -use ironrdp_pdu::rdp::server_license::*; -use ironrdp_pdu::rdp::*; +use ironrdp_pdu::rdp::finalization_messages::{ + ControlAction, ControlPdu, FontPdu, MonitorLayoutPdu, SequenceFlags, SynchronizePdu, +}; +use ironrdp_pdu::rdp::headers::{ + BasicSecurityHeader, BasicSecurityHeaderFlags, CompressionFlags, ShareControlHeader, ShareControlPdu, + ShareDataHeader, ShareDataPdu, StreamPriority, +}; +use ironrdp_pdu::rdp::server_license::{ + LicenseErrorCode, LicenseHeader, LicensePdu, LicensingErrorMessage, LicensingStateTransition, PreambleFlags, + PreambleType, PreambleVersion, +}; +use ironrdp_pdu::rdp::{client_info, ClientInfoPdu}; use crate::capsets::{ CLIENT_DEMAND_ACTIVE, CLIENT_DEMAND_ACTIVE_BUFFER, SERVER_DEMAND_ACTIVE, SERVER_DEMAND_ACTIVE_BUFFER, diff --git a/crates/ironrdp-testsuite-core/src/security_data.rs b/crates/ironrdp-testsuite-core/src/security_data.rs index fabe11e0..e7842a59 100644 --- a/crates/ironrdp-testsuite-core/src/security_data.rs +++ b/crates/ironrdp-testsuite-core/src/security_data.rs @@ -1,4 +1,4 @@ -use ironrdp_pdu::gcc::*; +use ironrdp_pdu::gcc::{ClientSecurityData, EncryptionLevel, EncryptionMethod, ServerSecurityData}; pub const CLIENT_SECURITY_DATA_BUFFER: [u8; 8] = [ 0x1b, 0x00, 0x00, 0x00, // encryption methods