From 5531392cf39129e1e0afef79f9ae048a6b0205fb Mon Sep 17 00:00:00 2001 From: Jackson Coxson Date: Thu, 24 Jul 2025 13:32:09 -0600 Subject: [PATCH] Clean up tools warnings --- tools/src/mounter.rs | 2 +- tools/src/remotexpc.rs | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/src/mounter.rs b/tools/src/mounter.rs index 8e7eff1..681705f 100644 --- a/tools/src/mounter.rs +++ b/tools/src/mounter.rs @@ -208,7 +208,7 @@ async fn main() { unique_chip_id, async |((n, d), _)| { let percent = (n as f64 / d as f64) * 100.0; - print!("\rProgress: {:.2}%", percent); + print!("\rProgress: {percent:.2}%"); std::io::stdout().flush().unwrap(); // Make sure it prints immediately if n == d { println!(); diff --git a/tools/src/remotexpc.rs b/tools/src/remotexpc.rs index 7f79180..e4bc551 100644 --- a/tools/src/remotexpc.rs +++ b/tools/src/remotexpc.rs @@ -3,7 +3,7 @@ use clap::{Arg, Command}; use idevice::{ - core_device_proxy::CoreDeviceProxy, tcp::stream::AdapterStream, xpc::RemoteXpcClient, + core_device_proxy::CoreDeviceProxy, rsd::RsdHandshake, tcp::stream::AdapterStream, IdeviceService, }; @@ -66,13 +66,12 @@ async fn main() { let rsd_port = proxy.handshake.server_rsd_port; let mut adapter = proxy.create_software_tunnel().expect("no software tunnel"); - adapter.pcap("new_xpc.pcap").await.unwrap(); - let conn = AdapterStream::connect(&mut adapter, rsd_port) + + let stream = AdapterStream::connect(&mut adapter, rsd_port) .await .expect("no RSD connect"); // Make the connection to RemoteXPC - let mut client = RemoteXpcClient::new(Box::new(conn)).await.unwrap(); - - println!("{:#?}", client.do_handshake().await); + let handshake = RsdHandshake::new(stream).await.unwrap(); + println!("{:#?}", handshake.services); }