style: cargo +nightly fmt

This commit is contained in:
Benoît CORTIER
2024-11-20 01:28:31 +09:00
committed by Benoît Cortier
parent 807eb59b07
commit 294af1cc5c
213 changed files with 546 additions and 566 deletions
@@ -2,7 +2,8 @@ use std::collections::HashSet;
use ironrdp_connector::{reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written};
use ironrdp_core::WriteBuf;
use ironrdp_pdu::{self as pdu, x224::X224};
use ironrdp_pdu::x224::X224;
use ironrdp_pdu::{self as pdu};
use pdu::mcs;
#[derive(Debug)]
+2 -5
View File
@@ -5,8 +5,7 @@ use ironrdp_connector::{
encode_x224_packet, reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, DesktopSize, Sequence, State,
Written,
};
use ironrdp_core::decode;
use ironrdp_core::WriteBuf;
use ironrdp_core::{decode, WriteBuf};
use ironrdp_pdu as pdu;
use ironrdp_pdu::nego::SecurityProtocol;
use ironrdp_pdu::x224::X224;
@@ -14,9 +13,7 @@ use ironrdp_svc::{StaticChannelSet, SvcServerProcessor};
use pdu::rdp::capability_sets::CapabilitySet;
use pdu::rdp::client_info::Credentials;
use pdu::rdp::headers::ShareControlPdu;
use pdu::rdp::server_error_info::ErrorInfo;
use pdu::rdp::server_error_info::ProtocolIndependentCode;
use pdu::rdp::server_error_info::ServerSetErrorInfoPdu;
use pdu::rdp::server_error_info::{ErrorInfo, ProtocolIndependentCode, ServerSetErrorInfoPdu};
use pdu::rdp::server_license::{LicensePdu, LicensingErrorMessage};
use pdu::{gcc, mcs, nego, rdp};
+7 -9
View File
@@ -1,13 +1,11 @@
use ironrdp_connector::credssp::KerberosConfig;
use ironrdp_connector::sspi::credssp::{
ClientMode, CredSspServer, CredentialsProxy, ServerError, ServerState, TsRequest,
};
use ironrdp_connector::sspi::negotiate::ProtocolConfig;
use ironrdp_connector::sspi::{self, AuthIdentity, Username};
use ironrdp_connector::{
credssp::KerberosConfig,
custom_err, general_err,
sspi::{
self,
credssp::{ClientMode, CredSspServer, CredentialsProxy, ServerError, ServerState, TsRequest},
negotiate::ProtocolConfig,
AuthIdentity, Username,
},
ConnectorError, ConnectorErrorKind, ConnectorResult, ServerName, Written,
custom_err, general_err, ConnectorError, ConnectorErrorKind, ConnectorResult, ServerName, Written,
};
use ironrdp_core::{other_err, WriteBuf};
use ironrdp_pdu::PduHint;
+2 -1
View File
@@ -1,6 +1,7 @@
use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written};
use ironrdp_core::WriteBuf;
use ironrdp_pdu::{self as pdu, x224::X224};
use ironrdp_pdu::x224::X224;
use ironrdp_pdu::{self as pdu};
use pdu::rdp;
use crate::util::{self, wrap_share_data};
+2 -1
View File
@@ -2,7 +2,8 @@ use std::borrow::Cow;
use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult};
use ironrdp_core::{encode_vec, Encode, WriteBuf};
use ironrdp_pdu::{rdp, x224::X224};
use ironrdp_pdu::rdp;
use ironrdp_pdu::x224::X224;
pub(crate) fn encode_send_data_indication<T>(
initiator_id: u16,
+3 -3
View File
@@ -4,12 +4,12 @@
)]
use bitflags::bitflags;
use ironrdp_core::{
ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor,
};
use ironrdp_dvc::DvcEncode;
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive as _, ToPrimitive as _};
use ironrdp_core::{ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor};
use ironrdp_core::{Decode, Encode};
// Advanced Input channel as defined from Freerdp, [here]:
//
// [here]: https://github.com/FreeRDP/FreeRDP/blob/master/include/freerdp/channels/ainput.h
+2 -1
View File
@@ -213,7 +213,8 @@ impl<S> FramedWrite for Framed<S>
where
S: FramedWrite,
{
type WriteAllFut<'write> = S::WriteAllFut<'write>
type WriteAllFut<'write>
= S::WriteAllFut<'write>
where
Self: 'write;
+2 -2
View File
@@ -1,7 +1,7 @@
use ironrdp_core::{
cast_int, ensure_fixed_part_size, invalid_field_err, DecodeResult, EncodeResult, ReadCursor, WriteCursor,
cast_int, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor,
WriteCursor,
};
use ironrdp_core::{Decode, Encode};
use thiserror::Error;
/// Maximum size of PNG image that could be placed on the clipboard.
+1 -2
View File
@@ -14,6 +14,7 @@ use ironrdp_cliprdr::pdu::{
use thiserror::Error;
use tracing::error;
use windows::core::{s, Error};
pub use windows::Win32::Foundation::HWND;
use windows::Win32::Foundation::*;
use windows::Win32::System::DataExchange::{AddClipboardFormatListener, RemoveClipboardFormatListener};
use windows::Win32::System::LibraryLoader::GetModuleHandleA;
@@ -25,8 +26,6 @@ use windows::Win32::UI::WindowsAndMessaging::{
use self::clipboard_impl::{clipboard_subproc, WinClipboardImpl};
use self::cliprdr_backend::WinCliprdrBackend;
pub use windows::Win32::Foundation::HWND;
const BACKEND_CHANNEL_SIZE: usize = 8;
const WM_CLIPRDR_BACKEND_EVENT: u32 = WM_USER;
+1 -2
View File
@@ -14,8 +14,7 @@ pub mod pdu;
use backend::CliprdrBackend;
use ironrdp_core::{decode, AsAny, EncodeResult};
use ironrdp_pdu::gcc::ChannelName;
use ironrdp_pdu::PduResult;
use ironrdp_pdu::{decode_err, encode_err};
use ironrdp_pdu::{decode_err, encode_err, PduResult};
use ironrdp_svc::{
ChannelFlags, CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor, SvcProcessorMessages,
SvcServerProcessor,
@@ -1,9 +1,8 @@
use bitflags::bitflags;
use ironrdp_core::{
cast_int, cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, DecodeError, DecodeResult,
EncodeResult, ReadCursor, WriteCursor,
cast_int, cast_length, ensure_fixed_part_size, ensure_size, invalid_field_err, Decode, DecodeError, DecodeResult,
Encode, EncodeResult, ReadCursor, WriteCursor,
};
use ironrdp_core::{Decode, Encode};
use ironrdp_pdu::{impl_pdu_pod, read_padding, write_padding};
use crate::pdu::PartialHeader;
@@ -1,9 +1,9 @@
use std::borrow::Cow;
use ironrdp_core::{
cast_int, ensure_size, invalid_field_err, DecodeResult, EncodeResult, IntoOwned, ReadCursor, WriteCursor,
cast_int, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, IntoOwned, ReadCursor,
WriteCursor,
};
use ironrdp_core::{Decode, Encode};
use ironrdp_pdu::impl_pdu_borrowing;
use ironrdp_pdu::utils::{read_string_from_cursor, write_string_to_cursor, CharacterSet};
@@ -2,9 +2,9 @@ use std::borrow::Cow;
use bitflags::bitflags;
use ironrdp_core::{
cast_int, ensure_size, invalid_field_err, DecodeResult, EncodeResult, IntoOwned, ReadCursor, WriteCursor,
cast_int, ensure_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, IntoOwned, ReadCursor,
WriteCursor,
};
use ironrdp_core::{Decode, Encode};
use ironrdp_pdu::impl_pdu_borrowing;
use ironrdp_pdu::utils::{combine_u64, split_u64};
@@ -9,13 +9,10 @@ pub use self::palette::*;
#[rustfmt::skip]
use std::borrow::Cow;
use ironrdp_core::cast_int;
use ironrdp_core::ensure_fixed_part_size;
use ironrdp_core::ensure_size;
use ironrdp_core::DecodeResult;
use ironrdp_core::EncodeResult;
use ironrdp_core::IntoOwned;
use ironrdp_core::{Decode, Encode, ReadCursor, WriteCursor};
use ironrdp_core::{
cast_int, ensure_fixed_part_size, ensure_size, Decode, DecodeResult, Encode, EncodeResult, IntoOwned, ReadCursor,
WriteCursor,
};
use ironrdp_pdu::impl_pdu_borrowing;
use ironrdp_pdu::utils::{read_string_from_cursor, to_utf16_bytes, CharacterSet};
+3 -5
View File
@@ -17,11 +17,9 @@ pub use self::lock::*;
#[rustfmt::skip]
use bitflags::bitflags;
use ironrdp_core::ensure_fixed_part_size;
use ironrdp_core::invalid_field_err;
use ironrdp_core::DecodeResult;
use ironrdp_core::EncodeResult;
use ironrdp_core::{Decode, Encode, ReadCursor, WriteCursor};
use ironrdp_core::{
ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor, WriteCursor,
};
use ironrdp_svc::SvcEncode;
const MSG_TYPE_MONITOR_READY: u16 = 0x0001;
@@ -1,8 +1,9 @@
use std::collections::HashSet;
use core::mem;
use std::collections::HashSet;
use ironrdp_core::WriteBuf;
use ironrdp_pdu::{mcs, x224::X224, PduHint};
use ironrdp_pdu::x224::X224;
use ironrdp_pdu::{mcs, PduHint};
use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written};
+1 -1
View File
@@ -1,5 +1,5 @@
use std::borrow::Cow;
use core::mem;
use std::borrow::Cow;
use std::net::SocketAddr;
use ironrdp_core::{decode, encode_vec, Encode, WriteBuf};
@@ -1,6 +1,7 @@
use core::mem;
use ironrdp_pdu::rdp::{self, capability_sets::CapabilitySet};
use ironrdp_pdu::rdp::capability_sets::CapabilitySet;
use ironrdp_pdu::rdp::{self};
use crate::{legacy, Config, ConnectionFinalizationSequence, ConnectorResult, DesktopSize, Sequence, State, Written};
+1 -2
View File
@@ -1,7 +1,6 @@
use std::borrow::Cow;
use ironrdp_core::WriteBuf;
use ironrdp_core::{decode, encode_vec, Decode, Encode};
use ironrdp_core::{decode, encode_vec, Decode, Encode, WriteBuf};
use ironrdp_pdu::rdp;
use ironrdp_pdu::rdp::headers::ServerDeactivateAll;
use ironrdp_pdu::x224::X224;
+1 -2
View File
@@ -25,8 +25,7 @@ use core::fmt;
pub use channel_connection::{ChannelConnectionSequence, ChannelConnectionState};
pub use connection::{encode_send_data_request, ClientConnector, ClientConnectorState, ConnectionResult};
pub use connection_finalization::{ConnectionFinalizationSequence, ConnectionFinalizationState};
use ironrdp_core::WriteBuf;
use ironrdp_core::{encode_buf, encode_vec, Encode};
use ironrdp_core::{encode_buf, encode_vec, Encode, WriteBuf};
use ironrdp_pdu::rdp::capability_sets;
use ironrdp_pdu::rdp::client_info::PerformanceFlags;
use ironrdp_pdu::x224::X224;

Some files were not shown because too many files have changed in this diff Show More