From 35c19ce444bcbb1b4250d00977d60b30fab42eca Mon Sep 17 00:00:00 2001 From: Alex Yusiuk <55661041+RRRadicalEdward@users.noreply.github.com> Date: Tue, 19 Aug 2025 09:52:42 +0300 Subject: [PATCH] build: fix failing CI on master (#918) --- Cargo.lock | 2 +- crates/ironrdp-mstsgu/src/lib.rs | 40 +++++++++++++++----------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 549a5ed8..1acee881 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5792,7 +5792,7 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror 2.0.12", + "thiserror 2.0.14", "utf-8", ] diff --git a/crates/ironrdp-mstsgu/src/lib.rs b/crates/ironrdp-mstsgu/src/lib.rs index 9f38db8d..f0e26207 100644 --- a/crates/ironrdp-mstsgu/src/lib.rs +++ b/crates/ironrdp-mstsgu/src/lib.rs @@ -3,37 +3,35 @@ //! * This only supports the HTTPS protocol with Websocket (and not the legacy HTTP, HTTP-RPC or UDP protocols). //! * This does not implement reconnection/reauthentication. //! * This only supports basic auth. +use core::fmt; +use core::fmt::Display; use core::pin::Pin; +use core::task::Poll; use core::time::Duration; -use core::{fmt, fmt::Display, task::Poll}; use std::io; -use base64::{engine::general_purpose::STANDARD, Engine as _}; -use futures_util::{ - stream::{SplitSink, SplitStream}, - FutureExt as _, SinkExt as _, StreamExt as _, -}; +use base64::engine::general_purpose::STANDARD; +use base64::Engine as _; +use futures_util::stream::{SplitSink, SplitStream}; +use futures_util::{FutureExt as _, SinkExt as _, StreamExt as _}; use hyper::body::Bytes; use ironrdp_core::{Decode as _, Encode, ReadCursor, WriteCursor}; use ironrdp_tls::TlsStream; use log::{error, warn}; -use tokio::{ - io::{AsyncRead, AsyncWrite}, - net::TcpStream, - sync::oneshot, -}; -use tokio_tungstenite::{ - tungstenite::{ - handshake::client::generate_key, - http::{self}, - protocol::Role, - Message, - }, - WebSocketStream, -}; +use tokio::io::{AsyncRead, AsyncWrite}; +use tokio::net::TcpStream; +use tokio::sync::oneshot; +use tokio_tungstenite::tungstenite::handshake::client::generate_key; +use tokio_tungstenite::tungstenite::http::{self}; +use tokio_tungstenite::tungstenite::protocol::Role; +use tokio_tungstenite::tungstenite::Message; +use tokio_tungstenite::WebSocketStream; mod proto; -use proto::*; +use proto::{ + ChannelPkt, ChannelResp, DataPkt, HandshakeReqPkt, HandshakeRespPkt, HttpCapsTy, KeepalivePkt, PktHdr, PktTy, + TunnelAuthPkt, TunnelAuthRespPkt, TunnelReqPkt, TunnelRespPkt, +}; use tokio_util::sync::PollSender; #[derive(Clone, Debug)]