Unify service naming across crates

ffi/src/lib.rs

@@ -7,7 +7,7 @@ mod errors;
 pub mod heartbeat;
 pub mod installation_proxy;
 pub mod location_simulation;
-pub mod lockdownd;
+pub mod lockdown;
 pub mod logging;
 pub mod mounter;
 mod pairing_file;

ffi/src/lockdown.rs

@@ -2,7 +2,7 @@
 
 use std::ffi::c_void;
 
-use idevice::{IdeviceError, IdeviceService, lockdownd::LockdowndClient};
+use idevice::{IdeviceError, IdeviceService, lockdown::LockdowndClient};
 
 use crate::{
     IdeviceErrorCode, IdeviceHandle, IdevicePairingFile, RUNTIME,

ffi/src/mounter.rs

@@ -2,7 +2,7 @@
 
 use std::ffi::c_void;
 
-use idevice::{IdeviceError, IdeviceService, mounter::ImageMounter};
+use idevice::{IdeviceError, IdeviceService, mobile_image_mounter::ImageMounter};
 use plist::Value;
 
 use crate::{

ffi/src/sbservices.rs

@@ -1,6 +1,6 @@
 use std::ffi::{CStr, c_void};
 
-use idevice::{IdeviceError, IdeviceService, sbservices::SpringBoardServicesClient};
+use idevice::{IdeviceError, IdeviceService, springboardservices::SpringBoardServicesClient};
 
 use crate::{
     IdeviceErrorCode, IdeviceHandle, RUNTIME,

idevice/src/afc/mod.rs

@@ -7,7 +7,7 @@ use log::warn;
 use opcode::AfcOpcode;
 use packet::{AfcPacket, AfcPacketHeader};
 
-use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService};
+use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService};
 
 pub mod errors;
 pub mod opcode;

idevice/src/core_device_proxy/mod.rs

@@ -1,6 +1,6 @@
 // Jackson Coxson
 
-use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService};
+use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService};
 
 use byteorder::{BigEndian, WriteBytesExt};
 use serde::{Deserialize, Serialize};

idevice/src/heartbeat.rs

@@ -1,7 +1,7 @@
 // Jackson Coxson
 // Abstractions for the heartbeat service on iOS
 
-use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService};
+use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService};
 
 pub struct HeartbeatClient {
     pub idevice: Idevice,

idevice/src/installation_proxy.rs

@@ -3,7 +3,7 @@
 
 use std::collections::HashMap;
 
-use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService};
+use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService};
 
 pub struct InstallationProxyClient {
     pub idevice: Idevice,

idevice/src/lib.rs

@@ -14,16 +14,16 @@ pub mod heartbeat;
 pub mod http2;
 #[cfg(feature = "installation_proxy")]
 pub mod installation_proxy;
-pub mod lockdownd;
+pub mod lockdown;
 #[cfg(feature = "misagent")]
 pub mod misagent;
 #[cfg(feature = "mounter")]
-pub mod mounter;
+pub mod mobile_image_mounter;
 pub mod pairing_file;
 pub mod provider;
-#[cfg(feature = "sbservices")]
-pub mod sbservices;
 mod sni;
+#[cfg(feature = "sbservices")]
+pub mod springboardservices;
 #[cfg(feature = "tunnel_tcp_stack")]
 pub mod tcp;
 #[cfg(feature = "tss")]

idevice/src/misagent.rs

@@ -4,7 +4,7 @@
 use log::warn;
 use plist::Dictionary;
 
-use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService};
+use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService};
 
 pub struct MisagentClient {
     pub idevice: Idevice,

idevice/src/mobile_image_mounter.rs

@@ -2,7 +2,7 @@
 
 use log::debug;
 
-use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService};
+use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService};
 
 #[cfg(feature = "tss")]
 use crate::tss::TSSRequest;

idevice/src/springboardservices.rs

@@ -1,4 +1,4 @@
-use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService};
+use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService};
 
 pub struct SpringBoardServicesClient {
     pub idevice: Idevice,

tools/src/ideviceinfo.rs

@@ -2,7 +2,7 @@
 // idevice Rust implementation of libimobiledevice's ideviceinfo
 
 use clap::{Arg, Command};
-use idevice::{lockdownd::LockdowndClient, pairing_file::PairingFile, IdeviceService};
+use idevice::{lockdown::LockdowndClient, pairing_file::PairingFile, IdeviceService};
 
 mod common;
 

tools/src/mounter.rs

@@ -5,7 +5,8 @@ use std::{io::Write, path::PathBuf};
 
 use clap::{arg, value_parser, Arg, Command};
 use idevice::{
-    lockdownd::LockdowndClient, mounter::ImageMounter, pretty_print_plist, IdeviceService,
+    lockdown::LockdowndClient, mobile_image_mounter::ImageMounter, pretty_print_plist,
+    IdeviceService,
 };
 
 mod common;