Skip to content

Commit 1fdbfd2

Browse files
refactor: add redundant_imports rustc style/readability lint (#923)
1 parent 27f5504 commit 1fdbfd2

24 files changed

Lines changed: 19 additions & 38 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ unused_qualifications = "warn"
6666
keyword_idents = "warn"
6767
noop_method_call = "warn"
6868
macro_use_extern_crate = "warn"
69+
redundant_imports = "warn"
6970
# missing_docs = "warn" # TODO: NOTE(@CBenoit): we probably want to ensure this in core tier crates only
7071

7172
# == Compile-time / optimization == #

crates/ironrdp-connector/src/connection_activation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ fn create_client_confirm_active(
266266
) -> rdp::capability_sets::ClientConfirmActive {
267267
use ironrdp_pdu::rdp::capability_sets::{
268268
client_codecs_capabilities, Bitmap, BitmapCache, BitmapDrawingFlags, Brush, CacheDefinition, CacheEntry,
269-
CapabilitySet, ClientConfirmActive, CmdFlags, DemandActive, FrameAcknowledge, General, GeneralExtraFlags,
270-
GlyphCache, GlyphSupportLevel, Input, InputFlags, LargePointer, LargePointerSupportFlags, MultifragmentUpdate,
269+
ClientConfirmActive, CmdFlags, DemandActive, FrameAcknowledge, General, GeneralExtraFlags, GlyphCache,
270+
GlyphSupportLevel, Input, InputFlags, LargePointer, LargePointerSupportFlags, MultifragmentUpdate,
271271
OffscreenBitmapCache, Order, OrderFlags, OrderSupportExFlags, Pointer, Sound, SoundFlags, SupportLevel,
272272
SurfaceCommands, VirtualChannel, VirtualChannelFlags, BITMAP_CACHE_ENTRIES_NUM, GLYPH_CACHE_NUM,
273273
SERVER_CHANNEL_ID,

crates/ironrdp-dvc/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::alloc::borrow::ToOwned as _;
1818
pub use ironrdp_pdu;
1919
use ironrdp_core::{assert_obj_safe, cast_length, encode_vec, other_err, AsAny, Encode, EncodeResult};
2020
use ironrdp_pdu::{decode_err, pdu_other_err, PduResult};
21-
use ironrdp_svc::{self, SvcMessage};
21+
use ironrdp_svc::SvcMessage;
2222

2323
mod complete_data;
2424
use complete_data::CompleteData;

crates/ironrdp-error/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#[cfg(feature = "alloc")]
66
extern crate alloc;
77

8-
#[cfg(feature = "alloc")]
8+
#[cfg(all(feature = "alloc", not(feature = "std")))]
99
use alloc::boxed::Box;
1010
use core::fmt;
1111

crates/ironrdp-fuzzing/src/oracles/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn pdu_decode(data: &[u8]) {
1818
use ironrdp_pdu::nego::{ConnectionConfirm, ConnectionRequest};
1919
use ironrdp_pdu::rdp::{capability_sets, headers, server_error_info, server_license, vc, ClientInfoPdu};
2020
use ironrdp_pdu::x224::X224;
21-
use ironrdp_pdu::{bitmap, codecs, fast_path, gcc, input, ironrdp_core, pcb, surface_commands};
21+
use ironrdp_pdu::{bitmap, codecs, fast_path, gcc, input, pcb, surface_commands};
2222

2323
let _ = decode::<X224<ConnectionRequest>>(data);
2424
let _ = decode::<X224<ConnectionConfirm>>(data);

crates/ironrdp-graphics/src/rlgr.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ use core::cmp::min;
22
use std::io;
33

44
use bitvec::field::BitField as _;
5-
use bitvec::order::Msb0;
65
use bitvec::prelude::*;
7-
use bitvec::slice::BitSlice;
86
use ironrdp_pdu::codecs::rfx::EntropyAlgorithm;
97

108
use crate::utils::Bits;

crates/ironrdp-mstsgu/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ use tokio::io::{AsyncRead, AsyncWrite};
2525
use tokio::net::TcpStream;
2626
use tokio::sync::oneshot;
2727
use tokio_tungstenite::tungstenite::handshake::client::generate_key;
28-
use tokio_tungstenite::tungstenite::http;
2928
use tokio_tungstenite::tungstenite::protocol::Role;
30-
use tokio_tungstenite::tungstenite::Message;
29+
use tokio_tungstenite::tungstenite::{http, Message};
3130
use tokio_tungstenite::WebSocketStream;
3231
use tokio_util::sync::PollSender;
3332

crates/ironrdp-pdu/src/basic_output/surface_commands/tests.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use ironrdp_core::{decode, encode};
22
use lazy_static::lazy_static;
33

44
use super::*;
5-
use crate::geometry::ExclusiveRectangle;
65

76
const FRAME_MARKER_BUFFER: [u8; 8] = [0x4, 0x0, 0x0, 0x0, 0x5, 0x0, 0x0, 0x0];
87

crates/ironrdp-pdu/src/mcs.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -939,16 +939,15 @@ pub use legacy::McsError;
939939
mod legacy {
940940
use std::io;
941941

942-
use ironrdp_core::{Decode, DecodeResult, Encode, EncodeResult};
942+
use ironrdp_core::{Decode, DecodeResult, Encode};
943943
use thiserror::Error;
944944

945945
use super::{
946946
cast_length, ensure_size, ConnectInitial, ConnectResponse, DomainParameters, PduError, ReadCursor, WriteCursor,
947947
RESULT_ENUM_LENGTH,
948948
};
949-
use crate::ber;
950-
use crate::gcc::conference_create::{ConferenceCreateRequest, ConferenceCreateResponse};
951-
use crate::gcc::GccError;
949+
use crate::gcc::{ConferenceCreateRequest, ConferenceCreateResponse, GccError};
950+
use crate::{ber, EncodeResult};
952951

953952
// impl<'de> McsPdu<'de> for ConnectInitial {
954953
// const MCS_NAME: &'static str = "DisconnectProviderUltimatum";

crates/ironrdp-pdu/src/rdp/capability_sets/bitmap_codecs/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ironrdp_core::{decode, decode_cursor, encode_vec, DecodeErrorKind};
1+
use ironrdp_core::{decode_cursor, encode_vec, DecodeErrorKind};
22
use lazy_static::lazy_static;
33

44
use super::*;

0 commit comments

Comments
 (0)