From e917a456704b5b64ca15be4ef43a074f3236cb79 Mon Sep 17 00:00:00 2001 From: cocool97 <34218602+cocool97@users.noreply.github.com> Date: Sun, 13 Apr 2025 16:38:38 +0200 Subject: [PATCH] feat: edition 2024 (#106) --- Cargo.toml | 2 +- adb_cli/src/adb_termios.rs | 2 +- adb_cli/src/handlers/local_commands.rs | 2 +- adb_cli/src/main.rs | 6 ++-- adb_cli/src/utils.rs | 2 +- adb_client/src/device/adb_message_device.rs | 6 ++-- .../src/device/adb_message_device_commands.rs | 2 +- adb_client/src/device/adb_tcp_device.rs | 2 +- adb_client/src/device/adb_usb_device.rs | 6 ++-- adb_client/src/device/commands/framebuffer.rs | 4 +-- adb_client/src/device/commands/install.rs | 4 +-- adb_client/src/device/commands/pull.rs | 8 +++--- adb_client/src/device/commands/push.rs | 8 +++--- adb_client/src/device/commands/reboot.rs | 2 +- adb_client/src/device/commands/shell.rs | 4 +-- adb_client/src/device/commands/stat.rs | 2 +- adb_client/src/device/commands/uninstall.rs | 2 +- adb_client/src/device/mod.rs | 2 +- adb_client/src/device/models/adb_rsa_key.rs | 4 +-- adb_client/src/device/shell_message_writer.rs | 2 +- .../src/emulator_device/commands/rotate.rs | 2 +- .../src/emulator_device/commands/sms.rs | 2 +- adb_client/src/mdns/mdns_discovery.rs | 28 ++++++++++--------- adb_client/src/server/adb_server.rs | 2 +- adb_client/src/server/commands/connect.rs | 2 +- adb_client/src/server/commands/devices.rs | 4 +-- adb_client/src/server/commands/disconnect.rs | 2 +- adb_client/src/server/commands/kill.rs | 2 +- adb_client/src/server/commands/mdns.rs | 2 +- adb_client/src/server/commands/reconnect.rs | 2 +- .../src/server/commands/server_status.rs | 2 +- adb_client/src/server/commands/version.rs | 2 +- .../src/server/commands/wait_for_device.rs | 2 +- .../src/server_device/adb_server_device.rs | 2 +- .../adb_server_device_commands.rs | 2 +- .../src/server_device/commands/forward.rs | 2 +- .../src/server_device/commands/framebuffer.rs | 2 +- .../server_device/commands/host_features.rs | 2 +- .../src/server_device/commands/install.rs | 2 +- adb_client/src/server_device/commands/list.rs | 2 +- .../src/server_device/commands/reboot.rs | 2 +- .../src/server_device/commands/reconnect.rs | 2 +- adb_client/src/server_device/commands/recv.rs | 3 +- .../src/server_device/commands/reverse.rs | 2 +- adb_client/src/server_device/commands/send.rs | 3 +- adb_client/src/server_device/commands/stat.rs | 2 +- .../src/server_device/commands/tcpip.rs | 2 +- .../src/server_device/commands/transport.rs | 2 +- .../src/server_device/commands/uninstall.rs | 2 +- adb_client/src/server_device/commands/usb.rs | 2 +- .../src/transports/tcp_emulator_transport.rs | 2 +- .../src/transports/tcp_server_transport.rs | 2 +- adb_client/src/transports/tcp_transport.rs | 14 +++++----- .../traits/adb_message_transport.rs | 2 +- adb_client/src/transports/usb_transport.rs | 6 ++-- benches/benchmark_adb_push.rs | 4 +-- pyadb_client/src/adb_server.rs | 2 +- 57 files changed, 98 insertions(+), 96 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 34ed467..64858ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" [workspace.package] authors = ["Corentin LIAUD"] -edition = "2021" +edition = "2024" homepage = "https://github.com/cocool97/adb_client" keywords = ["adb", "android", "tcp", "usb"] license = "MIT" diff --git a/adb_cli/src/adb_termios.rs b/adb_cli/src/adb_termios.rs index 836b800..be45a1e 100644 --- a/adb_cli/src/adb_termios.rs +++ b/adb_cli/src/adb_termios.rs @@ -2,7 +2,7 @@ use std::os::unix::prelude::{AsRawFd, RawFd}; -use termios::{tcsetattr, Termios, TCSANOW, VMIN, VTIME}; +use termios::{TCSANOW, Termios, VMIN, VTIME, tcsetattr}; use crate::Result; diff --git a/adb_cli/src/handlers/local_commands.rs b/adb_cli/src/handlers/local_commands.rs index 0eebde7..92411ad 100644 --- a/adb_cli/src/handlers/local_commands.rs +++ b/adb_cli/src/handlers/local_commands.rs @@ -1,7 +1,7 @@ use std::{fs::File, io::Write}; use adb_client::ADBServerDevice; -use anyhow::{anyhow, Result}; +use anyhow::{Result, anyhow}; use crate::models::LocalDeviceCommand; diff --git a/adb_cli/src/main.rs b/adb_cli/src/main.rs index 99e9c4e..b7e0f2f 100644 --- a/adb_cli/src/main.rs +++ b/adb_cli/src/main.rs @@ -50,7 +50,7 @@ fn main() -> Result<()> { match server_command.command { LocalCommand::DeviceCommands(device_commands) => (device.boxed(), device_commands), LocalCommand::LocalDeviceCommand(local_device_command) => { - return handle_local_commands(device, local_device_command) + return handle_local_commands(device, local_device_command); } } } @@ -65,7 +65,9 @@ fn main() -> Result<()> { None => ADBUSBDevice::autodetect()?, }, _ => { - anyhow::bail!("please either supply values for both the --vendor-id and --product-id flags or none."); + anyhow::bail!( + "please either supply values for both the --vendor-id and --product-id flags or none." + ); } }; (device.boxed(), usb_command.commands) diff --git a/adb_cli/src/utils.rs b/adb_cli/src/utils.rs index 1a87d3b..57e49f5 100644 --- a/adb_cli/src/utils.rs +++ b/adb_cli/src/utils.rs @@ -6,7 +6,7 @@ pub fn setup_logger(debug: bool) { false => "info", }; - std::env::set_var("RUST_LOG", level); + unsafe { std::env::set_var("RUST_LOG", level) }; } env_logger::init(); diff --git a/adb_client/src/device/adb_message_device.rs b/adb_client/src/device/adb_message_device.rs index 9105243..b0974b4 100644 --- a/adb_client/src/device/adb_message_device.rs +++ b/adb_client/src/device/adb_message_device.rs @@ -2,9 +2,9 @@ use byteorder::{LittleEndian, ReadBytesExt}; use rand::Rng; use std::io::{Cursor, Read, Seek}; -use crate::{constants::BUFFER_SIZE, ADBMessageTransport, AdbStatResponse, Result, RustADBError}; +use crate::{ADBMessageTransport, AdbStatResponse, Result, RustADBError, constants::BUFFER_SIZE}; -use super::{models::MessageSubcommand, ADBTransportMessage, MessageCommand}; +use super::{ADBTransportMessage, MessageCommand, models::MessageSubcommand}; /// Generic structure representing an ADB device reachable over an [`ADBMessageTransport`]. /// Structure is totally agnostic over which transport is truly used. @@ -146,7 +146,7 @@ impl ADBMessageDevice { return Err(RustADBError::ADBRequestFailed(format!( "Wrong command received {}", c - ))) + ))); } } } diff --git a/adb_client/src/device/adb_message_device_commands.rs b/adb_client/src/device/adb_message_device_commands.rs index 246e949..78b9e02 100644 --- a/adb_client/src/device/adb_message_device_commands.rs +++ b/adb_client/src/device/adb_message_device_commands.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbStatResponse, ADBDeviceExt, ADBMessageTransport, RebootType, Result}; +use crate::{ADBDeviceExt, ADBMessageTransport, RebootType, Result, models::AdbStatResponse}; use std::{ io::{Read, Write}, path::Path, diff --git a/adb_client/src/device/adb_tcp_device.rs b/adb_client/src/device/adb_tcp_device.rs index f60a4c2..5f2e8d3 100644 --- a/adb_client/src/device/adb_tcp_device.rs +++ b/adb_client/src/device/adb_tcp_device.rs @@ -2,9 +2,9 @@ use std::io::Write; use std::path::Path; use std::{io::Read, net::SocketAddr}; +use super::ADBTransportMessage; use super::adb_message_device::ADBMessageDevice; use super::models::MessageCommand; -use super::ADBTransportMessage; use crate::{ADBDeviceExt, ADBMessageTransport, ADBTransport, Result, TcpTransport}; /// Represent a device reached and available over USB. diff --git a/adb_client/src/device/adb_usb_device.rs b/adb_client/src/device/adb_usb_device.rs index 46661c7..0c9d0a2 100644 --- a/adb_client/src/device/adb_usb_device.rs +++ b/adb_client/src/device/adb_usb_device.rs @@ -1,7 +1,7 @@ -use rusb::constants::LIBUSB_CLASS_VENDOR_SPEC; use rusb::Device; use rusb::DeviceDescriptor; use rusb::UsbContext; +use rusb::constants::LIBUSB_CLASS_VENDOR_SPEC; use std::fs::read_to_string; use std::io::Read; use std::io::Write; @@ -12,10 +12,10 @@ use std::time::Duration; use super::adb_message_device::ADBMessageDevice; use super::models::MessageCommand; use super::{ADBRsaKey, ADBTransportMessage}; -use crate::device::adb_transport_message::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE, AUTH_TOKEN}; use crate::ADBDeviceExt; use crate::ADBMessageTransport; use crate::ADBTransport; +use crate::device::adb_transport_message::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE, AUTH_TOKEN}; use crate::{Result, RustADBError, USBTransport}; pub fn read_adb_private_key>(private_key_path: P) -> Result> { @@ -188,7 +188,7 @@ impl ADBUSBDevice { v => { return Err(RustADBError::ADBRequestFailed(format!( "Received AUTH message with type != 1 ({v})" - ))) + ))); } }; diff --git a/adb_client/src/device/commands/framebuffer.rs b/adb_client/src/device/commands/framebuffer.rs index 0a5a62a..d41422f 100644 --- a/adb_client/src/device/commands/framebuffer.rs +++ b/adb_client/src/device/commands/framebuffer.rs @@ -4,9 +4,9 @@ use byteorder::{LittleEndian, ReadBytesExt}; use image::{ImageBuffer, Rgba}; use crate::{ - device::{adb_message_device::ADBMessageDevice, MessageCommand}, - models::{FrameBufferInfoV1, FrameBufferInfoV2}, ADBMessageTransport, Result, RustADBError, + device::{MessageCommand, adb_message_device::ADBMessageDevice}, + models::{FrameBufferInfoV1, FrameBufferInfoV2}, }; impl ADBMessageDevice { diff --git a/adb_client/src/device/commands/install.rs b/adb_client/src/device/commands/install.rs index 52f5f5b..3170110 100644 --- a/adb_client/src/device/commands/install.rs +++ b/adb_client/src/device/commands/install.rs @@ -3,9 +3,9 @@ use std::{fs::File, path::Path}; use rand::Rng; use crate::{ - device::{adb_message_device::ADBMessageDevice, MessageWriter}, - utils::check_extension_is_apk, ADBMessageTransport, Result, + device::{MessageWriter, adb_message_device::ADBMessageDevice}, + utils::check_extension_is_apk, }; impl ADBMessageDevice { diff --git a/adb_client/src/device/commands/pull.rs b/adb_client/src/device/commands/pull.rs index 7f672db..9e5bc55 100644 --- a/adb_client/src/device/commands/pull.rs +++ b/adb_client/src/device/commands/pull.rs @@ -1,11 +1,11 @@ use std::io::Write; use crate::{ - device::{ - adb_message_device::ADBMessageDevice, models::MessageSubcommand, ADBTransportMessage, - MessageCommand, - }, ADBMessageTransport, Result, RustADBError, + device::{ + ADBTransportMessage, MessageCommand, adb_message_device::ADBMessageDevice, + models::MessageSubcommand, + }, }; impl ADBMessageDevice { diff --git a/adb_client/src/device/commands/push.rs b/adb_client/src/device/commands/push.rs index 5019f9c..d87ee7a 100644 --- a/adb_client/src/device/commands/push.rs +++ b/adb_client/src/device/commands/push.rs @@ -1,11 +1,11 @@ use std::io::Read; use crate::{ - device::{ - adb_message_device::ADBMessageDevice, ADBTransportMessage, MessageCommand, - MessageSubcommand, - }, ADBMessageTransport, Result, RustADBError, + device::{ + ADBTransportMessage, MessageCommand, MessageSubcommand, + adb_message_device::ADBMessageDevice, + }, }; impl ADBMessageDevice { diff --git a/adb_client/src/device/commands/reboot.rs b/adb_client/src/device/commands/reboot.rs index 79d4de4..9802a85 100644 --- a/adb_client/src/device/commands/reboot.rs +++ b/adb_client/src/device/commands/reboot.rs @@ -1,6 +1,6 @@ use crate::{ - device::{adb_message_device::ADBMessageDevice, MessageCommand}, ADBMessageTransport, RebootType, Result, + device::{MessageCommand, adb_message_device::ADBMessageDevice}, }; impl ADBMessageDevice { diff --git a/adb_client/src/device/commands/shell.rs b/adb_client/src/device/commands/shell.rs index 059f2bf..eea7097 100644 --- a/adb_client/src/device/commands/shell.rs +++ b/adb_client/src/device/commands/shell.rs @@ -1,10 +1,10 @@ use std::io::{ErrorKind, Read, Write}; -use crate::device::ShellMessageWriter; use crate::Result; +use crate::device::ShellMessageWriter; use crate::{ - device::{ADBMessageDevice, ADBTransportMessage, MessageCommand}, ADBMessageTransport, RustADBError, + device::{ADBMessageDevice, ADBTransportMessage, MessageCommand}, }; impl ADBMessageDevice { diff --git a/adb_client/src/device/commands/stat.rs b/adb_client/src/device/commands/stat.rs index c7a45ec..27619b0 100644 --- a/adb_client/src/device/commands/stat.rs +++ b/adb_client/src/device/commands/stat.rs @@ -1,5 +1,5 @@ use crate::{ - device::adb_message_device::ADBMessageDevice, ADBMessageTransport, AdbStatResponse, Result, + ADBMessageTransport, AdbStatResponse, Result, device::adb_message_device::ADBMessageDevice, }; impl ADBMessageDevice { diff --git a/adb_client/src/device/commands/uninstall.rs b/adb_client/src/device/commands/uninstall.rs index b7d2632..c7d4de5 100644 --- a/adb_client/src/device/commands/uninstall.rs +++ b/adb_client/src/device/commands/uninstall.rs @@ -1,4 +1,4 @@ -use crate::{device::adb_message_device::ADBMessageDevice, ADBMessageTransport, Result}; +use crate::{ADBMessageTransport, Result, device::adb_message_device::ADBMessageDevice}; impl ADBMessageDevice { pub(crate) fn uninstall(&mut self, package_name: &str) -> Result<()> { diff --git a/adb_client/src/device/mod.rs b/adb_client/src/device/mod.rs index d9fa0e9..06560ab 100644 --- a/adb_client/src/device/mod.rs +++ b/adb_client/src/device/mod.rs @@ -11,7 +11,7 @@ mod shell_message_writer; use adb_message_device::ADBMessageDevice; pub use adb_tcp_device::ADBTcpDevice; pub use adb_transport_message::{ADBTransportMessage, ADBTransportMessageHeader}; -pub use adb_usb_device::{get_default_adb_key_path, ADBUSBDevice}; +pub use adb_usb_device::{ADBUSBDevice, get_default_adb_key_path}; pub use message_writer::MessageWriter; pub use models::{ADBRsaKey, MessageCommand, MessageSubcommand}; pub use shell_message_writer::ShellMessageWriter; diff --git a/adb_client/src/device/models/adb_rsa_key.rs b/adb_client/src/device/models/adb_rsa_key.rs index 14b9050..396f040 100644 --- a/adb_client/src/device/models/adb_rsa_key.rs +++ b/adb_client/src/device/models/adb_rsa_key.rs @@ -1,8 +1,8 @@ use crate::{Result, RustADBError}; -use base64::{engine::general_purpose::STANDARD, Engine}; +use base64::{Engine, engine::general_purpose::STANDARD}; use num_bigint::{BigUint, ModInverse}; -use num_traits::cast::ToPrimitive; use num_traits::FromPrimitive; +use num_traits::cast::ToPrimitive; use rsa::pkcs8::DecodePrivateKey; use rsa::traits::PublicKeyParts; use rsa::{Pkcs1v15Sign, RsaPrivateKey}; diff --git a/adb_client/src/device/shell_message_writer.rs b/adb_client/src/device/shell_message_writer.rs index e387624..5533a1f 100644 --- a/adb_client/src/device/shell_message_writer.rs +++ b/adb_client/src/device/shell_message_writer.rs @@ -2,7 +2,7 @@ use std::io::Write; use crate::ADBMessageTransport; -use super::{models::MessageCommand, ADBTransportMessage}; +use super::{ADBTransportMessage, models::MessageCommand}; /// [`Write`] trait implementation to hide underlying ADB protocol write logic for shell commands. pub struct ShellMessageWriter { diff --git a/adb_client/src/emulator_device/commands/rotate.rs b/adb_client/src/emulator_device/commands/rotate.rs index 47a96b5..0da9d3e 100644 --- a/adb_client/src/emulator_device/commands/rotate.rs +++ b/adb_client/src/emulator_device/commands/rotate.rs @@ -1,4 +1,4 @@ -use crate::{emulator_device::ADBEmulatorCommand, ADBEmulatorDevice, Result}; +use crate::{ADBEmulatorDevice, Result, emulator_device::ADBEmulatorCommand}; impl ADBEmulatorDevice { /// Send a SMS to this emulator with given content with given phone number diff --git a/adb_client/src/emulator_device/commands/sms.rs b/adb_client/src/emulator_device/commands/sms.rs index 8c1e45b..627feb9 100644 --- a/adb_client/src/emulator_device/commands/sms.rs +++ b/adb_client/src/emulator_device/commands/sms.rs @@ -1,4 +1,4 @@ -use crate::{emulator_device::ADBEmulatorCommand, ADBEmulatorDevice, Result}; +use crate::{ADBEmulatorDevice, Result, emulator_device::ADBEmulatorCommand}; impl ADBEmulatorDevice { /// Send a SMS to this emulator with given content with given phone number diff --git a/adb_client/src/mdns/mdns_discovery.rs b/adb_client/src/mdns/mdns_discovery.rs index 376d12f..39b4e67 100644 --- a/adb_client/src/mdns/mdns_discovery.rs +++ b/adb_client/src/mdns/mdns_discovery.rs @@ -33,19 +33,21 @@ impl MDNSDiscoveryService { pub fn start(&mut self, sender: Sender) -> Result<()> { let receiver = self.daemon.browse(ADB_SERVICE_NAME)?; - let handle: JoinHandle> = std::thread::spawn(move || loop { - while let Ok(event) = receiver.recv() { - match event { - ServiceEvent::SearchStarted(_) - | ServiceEvent::ServiceRemoved(_, _) - | ServiceEvent::ServiceFound(_, _) - | ServiceEvent::SearchStopped(_) => { - // Ignoring these events. We are only interesting in found devices - continue; - } - ServiceEvent::ServiceResolved(service_info) => { - if let Err(e) = sender.send(MDNSDevice::from(service_info)) { - return Err(e.into()); + let handle: JoinHandle> = std::thread::spawn(move || { + loop { + while let Ok(event) = receiver.recv() { + match event { + ServiceEvent::SearchStarted(_) + | ServiceEvent::ServiceRemoved(_, _) + | ServiceEvent::ServiceFound(_, _) + | ServiceEvent::SearchStopped(_) => { + // Ignoring these events. We are only interesting in found devices + continue; + } + ServiceEvent::ServiceResolved(service_info) => { + if let Err(e) = sender.send(MDNSDevice::from(service_info)) { + return Err(e.into()); + } } } } diff --git a/adb_client/src/server/adb_server.rs b/adb_client/src/server/adb_server.rs index d649348..33b7987 100644 --- a/adb_client/src/server/adb_server.rs +++ b/adb_client/src/server/adb_server.rs @@ -105,7 +105,7 @@ impl ADBServer { impl Drop for ADBServer { fn drop(&mut self) { - if let Some(ref mut transport) = &mut self.transport { + if let Some(transport) = &mut self.transport { let _ = transport.disconnect(); } } diff --git a/adb_client/src/server/commands/connect.rs b/adb_client/src/server/commands/connect.rs index bc1201f..2dab419 100644 --- a/adb_client/src/server/commands/connect.rs +++ b/adb_client/src/server/commands/connect.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServer, Result, RustADBError}; +use crate::{ADBServer, Result, RustADBError, models::AdbServerCommand}; use std::net::SocketAddrV4; impl ADBServer { diff --git a/adb_client/src/server/commands/devices.rs b/adb_client/src/server/commands/devices.rs index 98d569d..cf3bbc1 100644 --- a/adb_client/src/server/commands/devices.rs +++ b/adb_client/src/server/commands/devices.rs @@ -1,8 +1,8 @@ use std::io::Read; use crate::{ - models::AdbServerCommand, ADBEmulatorDevice, ADBServer, ADBServerDevice, DeviceLong, - DeviceShort, Result, RustADBError, + ADBEmulatorDevice, ADBServer, ADBServerDevice, DeviceLong, DeviceShort, Result, RustADBError, + models::AdbServerCommand, }; impl ADBServer { diff --git a/adb_client/src/server/commands/disconnect.rs b/adb_client/src/server/commands/disconnect.rs index d570e93..2d4ea1e 100644 --- a/adb_client/src/server/commands/disconnect.rs +++ b/adb_client/src/server/commands/disconnect.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServer, Result, RustADBError}; +use crate::{ADBServer, Result, RustADBError, models::AdbServerCommand}; use std::net::SocketAddrV4; impl ADBServer { diff --git a/adb_client/src/server/commands/kill.rs b/adb_client/src/server/commands/kill.rs index 65b6d8e..89f02f8 100644 --- a/adb_client/src/server/commands/kill.rs +++ b/adb_client/src/server/commands/kill.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServer, Result}; +use crate::{ADBServer, Result, models::AdbServerCommand}; impl ADBServer { /// Asks the ADB server to quit immediately. diff --git a/adb_client/src/server/commands/mdns.rs b/adb_client/src/server/commands/mdns.rs index b72a151..0c00352 100644 --- a/adb_client/src/server/commands/mdns.rs +++ b/adb_client/src/server/commands/mdns.rs @@ -1,7 +1,7 @@ use std::io::BufRead; use crate::{ - models::AdbServerCommand, server::models::MDNSBackend, ADBServer, MDNSServices, Result, + ADBServer, MDNSServices, Result, models::AdbServerCommand, server::models::MDNSBackend, }; const OPENSCREEN_MDNS_BACKEND: &str = "ADB_MDNS_OPENSCREEN"; diff --git a/adb_client/src/server/commands/reconnect.rs b/adb_client/src/server/commands/reconnect.rs index e7b9338..aa24bbd 100644 --- a/adb_client/src/server/commands/reconnect.rs +++ b/adb_client/src/server/commands/reconnect.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServer, Result}; +use crate::{ADBServer, Result, models::AdbServerCommand}; impl ADBServer { /// Reconnect the device diff --git a/adb_client/src/server/commands/server_status.rs b/adb_client/src/server/commands/server_status.rs index ae85e5b..dcba402 100644 --- a/adb_client/src/server/commands/server_status.rs +++ b/adb_client/src/server/commands/server_status.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, server::models::ServerStatus, ADBServer, Result}; +use crate::{ADBServer, Result, models::AdbServerCommand, server::models::ServerStatus}; impl ADBServer { /// Check ADB server status diff --git a/adb_client/src/server/commands/version.rs b/adb_client/src/server/commands/version.rs index a39f061..8dd0a52 100644 --- a/adb_client/src/server/commands/version.rs +++ b/adb_client/src/server/commands/version.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServer, AdbVersion, Result}; +use crate::{ADBServer, AdbVersion, Result, models::AdbServerCommand}; impl ADBServer { /// Gets server's internal version number. diff --git a/adb_client/src/server/commands/wait_for_device.rs b/adb_client/src/server/commands/wait_for_device.rs index 7c47cdc..abef15c 100644 --- a/adb_client/src/server/commands/wait_for_device.rs +++ b/adb_client/src/server/commands/wait_for_device.rs @@ -1,5 +1,5 @@ use crate::{ - models::AdbServerCommand, ADBServer, Result, WaitForDeviceState, WaitForDeviceTransport, + ADBServer, Result, WaitForDeviceState, WaitForDeviceTransport, models::AdbServerCommand, }; impl ADBServer { diff --git a/adb_client/src/server_device/adb_server_device.rs b/adb_client/src/server_device/adb_server_device.rs index b96d6eb..1c8d480 100644 --- a/adb_client/src/server_device/adb_server_device.rs +++ b/adb_client/src/server_device/adb_server_device.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBTransport, Result, TCPServerTransport}; +use crate::{ADBTransport, Result, TCPServerTransport, models::AdbServerCommand}; use std::net::SocketAddrV4; /// Represents a device connected to the ADB server. diff --git a/adb_client/src/server_device/adb_server_device_commands.rs b/adb_client/src/server_device/adb_server_device_commands.rs index 3d654bf..af276ed 100644 --- a/adb_client/src/server_device/adb_server_device_commands.rs +++ b/adb_client/src/server_device/adb_server_device_commands.rs @@ -4,9 +4,9 @@ use std::{ }; use crate::{ + ADBDeviceExt, Result, RustADBError, constants::BUFFER_SIZE, models::{AdbServerCommand, AdbStatResponse, HostFeatures}, - ADBDeviceExt, Result, RustADBError, }; use super::ADBServerDevice; diff --git a/adb_client/src/server_device/commands/forward.rs b/adb_client/src/server_device/commands/forward.rs index 98ee8d1..ff571f3 100644 --- a/adb_client/src/server_device/commands/forward.rs +++ b/adb_client/src/server_device/commands/forward.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServerDevice, Result}; +use crate::{ADBServerDevice, Result, models::AdbServerCommand}; impl ADBServerDevice { /// Forward socket connection diff --git a/adb_client/src/server_device/commands/framebuffer.rs b/adb_client/src/server_device/commands/framebuffer.rs index 3d7b926..b3a6e9f 100644 --- a/adb_client/src/server_device/commands/framebuffer.rs +++ b/adb_client/src/server_device/commands/framebuffer.rs @@ -4,8 +4,8 @@ use byteorder::{LittleEndian, ReadBytesExt}; use image::{ImageBuffer, Rgba}; use crate::{ - models::{AdbServerCommand, FrameBufferInfoV1, FrameBufferInfoV2}, ADBServerDevice, Result, RustADBError, + models::{AdbServerCommand, FrameBufferInfoV1, FrameBufferInfoV2}, }; impl ADBServerDevice { diff --git a/adb_client/src/server_device/commands/host_features.rs b/adb_client/src/server_device/commands/host_features.rs index 0bdaaea..428b7eb 100644 --- a/adb_client/src/server_device/commands/host_features.rs +++ b/adb_client/src/server_device/commands/host_features.rs @@ -1,6 +1,6 @@ use crate::{ - models::{AdbServerCommand, HostFeatures}, ADBServerDevice, Result, + models::{AdbServerCommand, HostFeatures}, }; impl ADBServerDevice { diff --git a/adb_client/src/server_device/commands/install.rs b/adb_client/src/server_device/commands/install.rs index 0a26e6c..29a77ef 100644 --- a/adb_client/src/server_device/commands/install.rs +++ b/adb_client/src/server_device/commands/install.rs @@ -1,7 +1,7 @@ use std::{fs::File, io::Read, path::Path}; use crate::{ - models::AdbServerCommand, server_device::ADBServerDevice, utils::check_extension_is_apk, Result, + Result, models::AdbServerCommand, server_device::ADBServerDevice, utils::check_extension_is_apk, }; impl ADBServerDevice { diff --git a/adb_client/src/server_device/commands/list.rs b/adb_client/src/server_device/commands/list.rs index 856806a..25e2914 100644 --- a/adb_client/src/server_device/commands/list.rs +++ b/adb_client/src/server_device/commands/list.rs @@ -1,6 +1,6 @@ use crate::{ - models::{AdbServerCommand, SyncCommand}, ADBServerDevice, Result, + models::{AdbServerCommand, SyncCommand}, }; use byteorder::{ByteOrder, LittleEndian}; use std::{ diff --git a/adb_client/src/server_device/commands/reboot.rs b/adb_client/src/server_device/commands/reboot.rs index cb79d71..3829e83 100644 --- a/adb_client/src/server_device/commands/reboot.rs +++ b/adb_client/src/server_device/commands/reboot.rs @@ -1,6 +1,6 @@ use crate::{ - models::{AdbServerCommand, RebootType}, ADBServerDevice, Result, + models::{AdbServerCommand, RebootType}, }; impl ADBServerDevice { diff --git a/adb_client/src/server_device/commands/reconnect.rs b/adb_client/src/server_device/commands/reconnect.rs index 5047a42..03e889a 100644 --- a/adb_client/src/server_device/commands/reconnect.rs +++ b/adb_client/src/server_device/commands/reconnect.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServerDevice, Result}; +use crate::{ADBServerDevice, Result, models::AdbServerCommand}; impl ADBServerDevice { /// Reconnect device diff --git a/adb_client/src/server_device/commands/recv.rs b/adb_client/src/server_device/commands/recv.rs index 35862f2..ec3e372 100644 --- a/adb_client/src/server_device/commands/recv.rs +++ b/adb_client/src/server_device/commands/recv.rs @@ -1,7 +1,6 @@ use crate::{ - constants, + ADBServerDevice, Result, constants, models::{AdbServerCommand, SyncCommand}, - ADBServerDevice, Result, }; use byteorder::{LittleEndian, ReadBytesExt}; use std::io::{BufReader, BufWriter, Read, Write}; diff --git a/adb_client/src/server_device/commands/reverse.rs b/adb_client/src/server_device/commands/reverse.rs index 282b552..b7d06db 100644 --- a/adb_client/src/server_device/commands/reverse.rs +++ b/adb_client/src/server_device/commands/reverse.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServerDevice, Result}; +use crate::{ADBServerDevice, Result, models::AdbServerCommand}; impl ADBServerDevice { /// Reverse socket connection diff --git a/adb_client/src/server_device/commands/send.rs b/adb_client/src/server_device/commands/send.rs index 2cb020e..3454c7e 100644 --- a/adb_client/src/server_device/commands/send.rs +++ b/adb_client/src/server_device/commands/send.rs @@ -1,7 +1,6 @@ use crate::{ - constants, + ADBServerDevice, Result, RustADBError, constants, models::{AdbRequestStatus, AdbServerCommand, SyncCommand}, - ADBServerDevice, Result, RustADBError, }; use std::{ convert::TryInto, diff --git a/adb_client/src/server_device/commands/stat.rs b/adb_client/src/server_device/commands/stat.rs index 3edd7dc..6d1defa 100644 --- a/adb_client/src/server_device/commands/stat.rs +++ b/adb_client/src/server_device/commands/stat.rs @@ -3,8 +3,8 @@ use std::io::{Read, Write}; use byteorder::{ByteOrder, LittleEndian}; use crate::{ - models::{AdbServerCommand, AdbStatResponse, SyncCommand}, ADBServerDevice, Result, RustADBError, + models::{AdbServerCommand, AdbStatResponse, SyncCommand}, }; impl ADBServerDevice { diff --git a/adb_client/src/server_device/commands/tcpip.rs b/adb_client/src/server_device/commands/tcpip.rs index af8f7f4..3cb01ed 100644 --- a/adb_client/src/server_device/commands/tcpip.rs +++ b/adb_client/src/server_device/commands/tcpip.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServerDevice, Result}; +use crate::{ADBServerDevice, Result, models::AdbServerCommand}; impl ADBServerDevice { /// Set adb daemon to tcp/ip mode diff --git a/adb_client/src/server_device/commands/transport.rs b/adb_client/src/server_device/commands/transport.rs index 2dee6c6..25b6ccb 100644 --- a/adb_client/src/server_device/commands/transport.rs +++ b/adb_client/src/server_device/commands/transport.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServerDevice, Result}; +use crate::{ADBServerDevice, Result, models::AdbServerCommand}; impl ADBServerDevice { /// Asks ADB server to switch the connection to either the device or emulator connect to/running on the host. Will fail if there is more than one such device/emulator available. diff --git a/adb_client/src/server_device/commands/uninstall.rs b/adb_client/src/server_device/commands/uninstall.rs index 25ef3a5..fa60170 100644 --- a/adb_client/src/server_device/commands/uninstall.rs +++ b/adb_client/src/server_device/commands/uninstall.rs @@ -1,6 +1,6 @@ use std::io::Read; -use crate::{models::AdbServerCommand, server_device::ADBServerDevice, Result}; +use crate::{Result, models::AdbServerCommand, server_device::ADBServerDevice}; impl ADBServerDevice { /// Uninstall a package from device diff --git a/adb_client/src/server_device/commands/usb.rs b/adb_client/src/server_device/commands/usb.rs index eb89460..e3c0ce2 100644 --- a/adb_client/src/server_device/commands/usb.rs +++ b/adb_client/src/server_device/commands/usb.rs @@ -1,4 +1,4 @@ -use crate::{models::AdbServerCommand, ADBServerDevice, Result}; +use crate::{ADBServerDevice, Result, models::AdbServerCommand}; impl ADBServerDevice { /// Set adb daemon to usb mode diff --git a/adb_client/src/transports/tcp_emulator_transport.rs b/adb_client/src/transports/tcp_emulator_transport.rs index f77209f..9a31542 100644 --- a/adb_client/src/transports/tcp_emulator_transport.rs +++ b/adb_client/src/transports/tcp_emulator_transport.rs @@ -7,7 +7,7 @@ use std::{ use homedir::my_home; use super::ADBTransport; -use crate::{emulator_device::ADBEmulatorCommand, Result, RustADBError}; +use crate::{Result, RustADBError, emulator_device::ADBEmulatorCommand}; /// Emulator transport running on top on TCP. #[derive(Debug)] diff --git a/adb_client/src/transports/tcp_server_transport.rs b/adb_client/src/transports/tcp_server_transport.rs index ddd8574..259f50f 100644 --- a/adb_client/src/transports/tcp_server_transport.rs +++ b/adb_client/src/transports/tcp_server_transport.rs @@ -5,7 +5,7 @@ use std::str::FromStr; use byteorder::{ByteOrder, LittleEndian}; use crate::models::{AdbRequestStatus, SyncCommand}; -use crate::{models::AdbServerCommand, ADBTransport}; +use crate::{ADBTransport, models::AdbServerCommand}; use crate::{Result, RustADBError}; const DEFAULT_SERVER_IP: Ipv4Addr = Ipv4Addr::new(127, 0, 0, 1); diff --git a/adb_client/src/transports/tcp_transport.rs b/adb_client/src/transports/tcp_transport.rs index 3024cce..5cb8e45 100644 --- a/adb_client/src/transports/tcp_transport.rs +++ b/adb_client/src/transports/tcp_transport.rs @@ -1,16 +1,16 @@ use rcgen::{CertificateParams, KeyPair, PKCS_RSA_SHA256}; use rustls::{ - client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}, - pki_types::{pem::PemObject, CertificateDer, PrivatePkcs8KeyDer}, ClientConfig, ClientConnection, KeyLogFile, SignatureScheme, StreamOwned, + client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}, + pki_types::{CertificateDer, PrivatePkcs8KeyDer, pem::PemObject}, }; use super::{ADBMessageTransport, ADBTransport}; use crate::{ - device::{ - get_default_adb_key_path, ADBTransportMessage, ADBTransportMessageHeader, MessageCommand, - }, Result, RustADBError, + device::{ + ADBTransportMessage, ADBTransportMessageHeader, MessageCommand, get_default_adb_key_path, + }, }; use std::{ fs::read_to_string, @@ -125,7 +125,7 @@ impl TcpTransport { None => { return Err(RustADBError::UpgradeError( "cannot upgrade a non-existing connection...".into(), - )) + )); } }; @@ -162,7 +162,7 @@ impl TcpTransport { CurrentConnection::Tls(_) => { return Err(RustADBError::UpgradeError( "cannot upgrade a TLS connection...".into(), - )) + )); } } } diff --git a/adb_client/src/transports/traits/adb_message_transport.rs b/adb_client/src/transports/traits/adb_message_transport.rs index 74b8886..67eefd5 100644 --- a/adb_client/src/transports/traits/adb_message_transport.rs +++ b/adb_client/src/transports/traits/adb_message_transport.rs @@ -1,7 +1,7 @@ use std::time::Duration; use super::ADBTransport; -use crate::{device::ADBTransportMessage, Result}; +use crate::{Result, device::ADBTransportMessage}; const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(u64::MAX); const DEFAULT_WRITE_TIMEOUT: Duration = Duration::from_secs(2); diff --git a/adb_client/src/transports/usb_transport.rs b/adb_client/src/transports/usb_transport.rs index 2ff9554..8ba12b3 100644 --- a/adb_client/src/transports/usb_transport.rs +++ b/adb_client/src/transports/usb_transport.rs @@ -1,14 +1,14 @@ use std::{sync::Arc, time::Duration}; use rusb::{ - constants::LIBUSB_CLASS_VENDOR_SPEC, Device, DeviceHandle, Direction, GlobalContext, - TransferType, + Device, DeviceHandle, Direction, GlobalContext, TransferType, + constants::LIBUSB_CLASS_VENDOR_SPEC, }; use super::{ADBMessageTransport, ADBTransport}; use crate::{ - device::{ADBTransportMessage, ADBTransportMessageHeader, MessageCommand}, Result, RustADBError, + device::{ADBTransportMessage, ADBTransportMessageHeader, MessageCommand}, }; #[derive(Clone, Debug)] diff --git a/benches/benchmark_adb_push.rs b/benches/benchmark_adb_push.rs index 20f9108..54d688c 100644 --- a/benches/benchmark_adb_push.rs +++ b/benches/benchmark_adb_push.rs @@ -1,7 +1,7 @@ use adb_client::ADBServer; use anyhow::Result; -use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; -use rand::{rng, Rng}; +use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main}; +use rand::{Rng, rng}; use std::fs::File; use std::io::Write; use std::process::Command; diff --git a/pyadb_client/src/adb_server.rs b/pyadb_client/src/adb_server.rs index f69dac5..abea3cd 100644 --- a/pyadb_client/src/adb_server.rs +++ b/pyadb_client/src/adb_server.rs @@ -2,7 +2,7 @@ use std::net::SocketAddrV4; use adb_client::ADBServer; use anyhow::Result; -use pyo3::{pyclass, pymethods, PyResult}; +use pyo3::{PyResult, pyclass, pymethods}; use pyo3_stub_gen_derive::{gen_stub_pyclass, gen_stub_pymethods}; use crate::{PyADBServerDevice, PyDeviceShort};