Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ allow_attributes = "warn"
disallowed_script_idents = "warn"
non_zero_suggestions = "warn"
renamed_function_params = "warn"
unused_trait_names = "warn"
collection_is_never_read = "warn"
copy_iterator = "warn"
expl_impl_clone_on_copy = "warn"
Expand Down
6 changes: 3 additions & 3 deletions benches/src/perfenc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

use core::num::NonZero;
use core::time::Duration;
use std::io::Write;
use std::io::Write as _;
use std::time::Instant;

use anyhow::Context;
use anyhow::Context as _;
use ironrdp::pdu::rdp::capability_sets::{CmdFlags, EntropyBits};
use ironrdp::server::bench::encoder::{UpdateEncoder, UpdateEncoderCodecs};
use ironrdp::server::{BitmapUpdate, DesktopSize, DisplayUpdate, PixelFormat, RdpServerDisplayUpdates};
use tokio::fs::File;
use tokio::io::AsyncReadExt;
use tokio::io::AsyncReadExt as _;
use tokio::time::sleep;

#[tokio::main(flavor = "current_thread")]
Expand Down
4 changes: 3 additions & 1 deletion crates/ironrdp-acceptor/src/channel_connection.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use std::collections::HashSet;

use ironrdp_connector::{reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written};
use ironrdp_connector::{
reason_err, ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written,
};
use ironrdp_core::WriteBuf;
use ironrdp_pdu::x224::X224;
use ironrdp_pdu::{self as pdu};
Expand Down
4 changes: 2 additions & 2 deletions crates/ironrdp-acceptor/src/connection.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use core::mem;

use ironrdp_connector::{
encode_x224_packet, reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, DesktopSize, Sequence, State,
Written,
encode_x224_packet, reason_err, ConnectorError, ConnectorErrorExt as _, ConnectorResult, DesktopSize, Sequence,
State, Written,
};
use ironrdp_core::{decode, WriteBuf};
use ironrdp_pdu as pdu;
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-acceptor/src/finalization.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written};
use ironrdp_connector::{ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written};
use ironrdp_core::WriteBuf;
use ironrdp_pdu::x224::X224;
use ironrdp_pdu::{self as pdu};
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-acceptor/src/util.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::borrow::Cow;

use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult};
use ironrdp_connector::{ConnectorError, ConnectorErrorExt as _, ConnectorResult};
use ironrdp_core::{encode_vec, Encode, WriteBuf};
use ironrdp_pdu::rdp;
use ironrdp_pdu::x224::X224;
Expand Down
4 changes: 2 additions & 2 deletions crates/ironrdp-client/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ use core::time::Duration;
use std::sync::Arc;
use std::time::Instant;

use raw_window_handle::{DisplayHandle, HasDisplayHandle};
use raw_window_handle::{DisplayHandle, HasDisplayHandle as _};
use tokio::sync::mpsc;
use winit::application::ApplicationHandler;
use winit::dpi::{LogicalPosition, PhysicalSize};
use winit::event::{self, WindowEvent};
use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
use winit::keyboard::ModifiersKeyState;
use winit::platform::scancode::PhysicalKeyExtScancode;
use winit::platform::scancode::PhysicalKeyExtScancode as _;
use winit::window::{CursorIcon, CustomCursor, Window, WindowAttributes};

use crate::rdp::{RdpInputEvent, RdpOutputEvent};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use ironrdp_cliprdr::pdu::{
ClipboardFormat, ClipboardGeneralCapabilityFlags, FileContentsRequest, FileContentsResponse, FormatDataRequest,
FormatDataResponse, LockDataId,
};
use ironrdp_core::{impl_as_any, IntoOwned};
use ironrdp_core::{impl_as_any, IntoOwned as _};
use windows::Win32::Foundation::{HWND, LPARAM, WPARAM};
use windows::Win32::UI::WindowsAndMessaging::PostMessageW;

Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-connector/src/license_exchange.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use ironrdp_pdu::rdp::server_license::{self, LicenseInformation, LicensePdu, Ser
use ironrdp_pdu::PduHint;
use rand::prelude::*;

use super::{legacy, ConnectorError, ConnectorErrorExt};
use super::{legacy, ConnectorError, ConnectorErrorExt as _};
use crate::{encode_send_data_request, ConnectorResult, ConnectorResultExt as _, Sequence, State, Written};

#[derive(Default, Debug)]
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-displaycontrol/src/client.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use ironrdp_core::{impl_as_any, Decode, EncodeResult, ReadCursor};
use ironrdp_core::{impl_as_any, Decode as _, EncodeResult, ReadCursor};
use ironrdp_dvc::{encode_dvc_messages, DvcClientProcessor, DvcMessage, DvcProcessor};
use ironrdp_pdu::{decode_err, PduResult};
use ironrdp_svc::{ChannelFlags, SvcMessage};
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-dvc-pipe-proxy/src/windows/pipe.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use core::ops::DerefMut;
use core::ops::DerefMut as _;
use core::pin::Pin;

use windows::core::{Owned, PCWSTR};
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-dvc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use core::any::TypeId;

use pdu::DrdynvcDataPdu;

use crate::alloc::borrow::ToOwned;
use crate::alloc::borrow::ToOwned as _;
// Re-export ironrdp_pdu crate for convenience
#[rustfmt::skip] // do not re-order this pub use
pub use ironrdp_pdu;
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-error/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ where
Kind: core::error::Error,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
use core::error::Error;
use core::error::Error as _;

write!(f, "{}", self.0)?;

Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-fuzzing/src/oracles/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ pub fn cliprdr_format(input: &[u8]) {
}

pub fn channel_process(input: &[u8]) {
use ironrdp_svc::SvcProcessor;
use ironrdp_svc::SvcProcessor as _;

let mut rdpdr = ironrdp_rdpdr::Rdpdr::new(Box::new(ironrdp_rdpdr::NoopRdpdrBackend), "Backend".to_owned())
.with_smartcard(1)
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-graphics/src/image_processing.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use core::{cmp, fmt};
use std::io;

use byteorder::WriteBytesExt;
use byteorder::WriteBytesExt as _;
use ironrdp_pdu::geometry::{InclusiveRectangle, Rectangle as _};
use num_derive::ToPrimitive;
use num_traits::ToPrimitive as _;
Expand Down
4 changes: 2 additions & 2 deletions crates/ironrdp-graphics/src/rdp6/rle.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use core::cmp;
use std::io::{Read, Write};
use std::io::{Read as _, Write as _};

use byteorder::ReadBytesExt;
use byteorder::ReadBytesExt as _;
use ironrdp_core::WriteCursor;

/// Maximum possible segment size is 47 (run_length = 2, raw_bytes_count = 15), which is treated as
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-graphics/src/zgfx/circular_buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl io::Write for FixedCircularBuffer {

#[cfg(test)]
mod tests {
use std::io::Write;
use std::io::Write as _;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-graphics/src/zgfx/control_messages.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use bit_field::BitField;
use bit_field::BitField as _;
use bitflags::bitflags;
use byteorder::{LittleEndian, ReadBytesExt as _};
use num_derive::FromPrimitive;
Expand Down
4 changes: 2 additions & 2 deletions crates/ironrdp-graphics/src/zgfx/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
mod circular_buffer;
mod control_messages;

use std::io::{self, Write};
use std::io::{self, Write as _};

use bitvec::bits;
use bitvec::field::BitField as _;
use bitvec::order::Msb0;
use bitvec::slice::BitSlice;
use byteorder::WriteBytesExt;
use byteorder::WriteBytesExt as _;

use self::circular_buffer::FixedCircularBuffer;
use self::control_messages::{BulkEncodedData, CompressionFlags, SegmentedDataPdu};
Expand Down
6 changes: 3 additions & 3 deletions crates/ironrdp-pdu/src/basic_output/fast_path.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#[cfg(test)]
mod tests;

use bit_field::BitField;
use bit_field::BitField as _;
use bitflags::bitflags;
use ironrdp_core::{
decode_cursor, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeError, DecodeResult, Encode,
EncodeResult, InvalidFieldErr, ReadCursor, WriteCursor,
EncodeResult, InvalidFieldErr as _, ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

use super::bitmap::BitmapUpdateData;
use super::pointer::PointerUpdateData;
Expand Down
4 changes: 2 additions & 2 deletions crates/ironrdp-pdu/src/codecs/rfx/data_messages.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use bit_field::BitField;
use bit_field::BitField as _;
use bitflags::bitflags;
use ironrdp_core::{
cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult,
ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

use crate::codecs::rfx::Block;

Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/gcc/core_data/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ironrdp_core::{
ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};
use tap::Pipe as _;

use super::{RdpVersion, VERSION_SIZE};
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/gcc/monitor_extended_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use ironrdp_core::{
ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

const MONITOR_COUNT_MAX: usize = 16;
const MONITOR_ATTRIBUTE_SIZE: u32 = 20;
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/gcc/network_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use ironrdp_core::{
cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, read_padding, write_padding, Decode,
DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor,
};
use num_integer::Integer;
use num_integer::Integer as _;
use thiserror::Error;

const CHANNELS_MAX: usize = 31;
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/gcc/security_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use ironrdp_core::{
ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};
use thiserror::Error;

const CLIENT_ENCRYPTION_METHODS_SIZE: usize = 4;
Expand Down
4 changes: 2 additions & 2 deletions crates/ironrdp-pdu/src/input/fast_path.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use bit_field::BitField;
use bit_field::BitField as _;
use bitflags::bitflags;
use ironrdp_core::{
cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, other_err, Decode, DecodeResult, Encode,
EncodeResult, ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

use crate::fast_path::EncryptionFlags;
use crate::input::{MousePdu, MouseRelPdu, MouseXPdu};
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/input/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use ironrdp_core::{
EncodeResult, ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};
use thiserror::Error;

pub mod fast_path;
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/per.rs
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ pub(crate) fn write_numeric_string(dst: &mut WriteCursor<'_>, num_str: &[u8], mi
pub(crate) mod legacy {
use std::io;

use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
use byteorder::{BigEndian, ReadBytesExt as _, WriteBytesExt as _};

use super::OBJECT_ID_SIZE;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use ironrdp_core::{
Encode, EncodeResult, ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

const RFX_ICAP_VERSION: u16 = 0x0100;
const RFX_ICAP_TILE_SIZE: u16 = 0x40;
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/rdp/capability_sets/brush.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use ironrdp_core::{
ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

const BRUSH_LENGTH: usize = 4;

Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/rdp/capability_sets/glyph_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use ironrdp_core::{
WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

pub const GLYPH_CACHE_NUM: usize = 10;

Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/rdp/capability_sets/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use ironrdp_core::{
ensure_fixed_part_size, read_padding, write_padding, Decode, DecodeResult, Encode, EncodeResult, ReadCursor,
WriteCursor,
};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

use crate::gcc::{KeyboardType, IME_FILE_NAME_SIZE};
use crate::utils;
Expand Down
2 changes: 1 addition & 1 deletion crates/ironrdp-pdu/src/rdp/headers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ironrdp_core::{
write_padding, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

use crate::codecs::rfx::FrameAcknowledgePdu;
use crate::input::InputEventPdu;
Expand Down
4 changes: 2 additions & 2 deletions crates/ironrdp-pdu/src/rdp/server_license.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ use ironrdp_core::{
cast_length, ensure_fixed_part_size, invalid_field_err, unsupported_value_err, Decode, DecodeResult, Encode,
EncodeResult, ReadCursor, WriteCursor,
};
use md5::Digest;
use md5::Digest as _;
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};
use thiserror::Error;

use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags, BASIC_SECURITY_HEADER_SIZE};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::io;

use byteorder::{LittleEndian, WriteBytesExt};
use byteorder::{LittleEndian, WriteBytesExt as _};
use ironrdp_core::{
ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor,
ensure_size, invalid_field_err, Decode as _, DecodeResult, Encode as _, EncodeResult, ReadCursor, WriteCursor,
};
use md5::Digest;
use md5::Digest as _;

use crate::crypto::rc4::Rc4;
use crate::crypto::rsa::encrypt_with_public_key;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ use std::io;

use bitflags::bitflags;
use ironrdp_core::{
ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor,
ensure_size, invalid_field_err, Decode as _, DecodeResult, Encode as _, EncodeResult, ReadCursor, WriteCursor,
};
use md5::Digest;
use md5::Digest as _;

use super::{
BasicSecurityHeader, BasicSecurityHeaderFlags, BlobHeader, BlobType, LicenseEncryptionData, LicenseHeader,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use byteorder::{LittleEndian, WriteBytesExt};
use byteorder::{LittleEndian, WriteBytesExt as _};
use ironrdp_core::{decode, encode_vec};
use lazy_static::lazy_static;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[cfg(test)]
mod test;

use std::io::Write;
use std::io::Write as _;

use byteorder::{LittleEndian, WriteBytesExt as _};
use ironrdp_core::{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
mod test;

use ironrdp_core::{
cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult,
ReadCursor, WriteCursor,
cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode as _, DecodeResult, Encode as _,
EncodeResult, ReadCursor, WriteCursor,
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};

use super::{BlobHeader, BlobType, LicenseHeader, PreambleFlags, PreambleVersion, BLOB_LENGTH_SIZE, BLOB_TYPE_SIZE};
use crate::rdp::headers::{BasicSecurityHeader, BasicSecurityHeaderFlags, BASIC_SECURITY_HEADER_SIZE};
Expand Down
Loading
Loading