core fixes

veilid-core/src/intf/native/android/get_directories.rs

@@ -1,5 +1,4 @@
 use super::*;
-use crate::xx::*;
 
 pub fn get_files_dir() -> String {
     let aglock = ANDROID_GLOBALS.lock();

veilid-core/src/intf/native/android/mod.rs

@@ -6,7 +6,6 @@ mod get_directories;
 pub use get_directories::*;
 
 use crate::veilid_config::VeilidConfigLogLevel;
-use crate::xx::*;
 use crate::*;
 use backtrace::Backtrace;
 use jni::errors::Result as JniResult;

veilid-core/src/intf/native/block_store.rs

@@ -1,4 +1,3 @@
-use crate::xx::*;
 use crate::*;
 
 struct BlockStoreInner {

veilid-core/src/intf/native/ios/mod.rs

@@ -1,4 +1,3 @@
-use crate::xx::*;
 use backtrace::Backtrace;
 use log::*;
 use simplelog::*;

veilid-core/src/intf/native/mod.rs

@@ -2,9 +2,14 @@ mod block_store;
 mod protected_store;
 mod system;
 mod table_store;
-pub mod utils;
 
 pub use block_store::*;
 pub use protected_store::*;
 pub use system::*;
 pub use table_store::*;
+
+#[cfg(target_os = "android")]
+pub mod android;
+#[cfg(all(target_os = "ios", feature = "ios_tests"))]
+pub mod ios_test_setup;
+pub mod network_interfaces;

veilid-core/src/intf/native/network_interfaces/apple.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::*;
+
 use libc::{
     close, freeifaddrs, getifaddrs, if_nametoindex, ifaddrs, ioctl, pid_t, sockaddr, sockaddr_in6,
     socket, sysctl, time_t, AF_INET6, CTL_NET, IFF_BROADCAST, IFF_LOOPBACK, IFF_RUNNING, IFNAMSIZ,

veilid-core/src/intf/native/network_interfaces/mod.rs

@@ -1,7 +1,7 @@
-use crate::xx::*;
-use core::fmt;
 mod tools;
 
+use crate::*;
+
 cfg_if::cfg_if! {
     if #[cfg(any(target_os = "linux", target_os = "android"))] {
         mod netlink;

veilid-core/src/intf/native/network_interfaces/netlink.rs

@@ -1,5 +1,4 @@
 use super::*;
-use crate::*;
 
 use alloc::collections::btree_map::Entry;
 use futures_util::stream::TryStreamExt;

veilid-core/src/intf/native/network_interfaces/windows.rs

@@ -63,7 +63,8 @@ impl PlatformSupportWindows {
         // }
 
         // Iterate all the interfaces
-        let windows_interfaces = WindowsInterfaces::new().wrap_err("failed to get windows interfaces")?;
+        let windows_interfaces =
+            WindowsInterfaces::new().wrap_err("failed to get windows interfaces")?;
         for windows_interface in windows_interfaces.iter() {
             // Get name
             let intf_name = windows_interface.name();

veilid-core/src/intf/native/protected_store.rs

@@ -1,4 +1,3 @@
-use crate::xx::*;
 use crate::*;
 use data_encoding::BASE64URL_NOPAD;
 use keyring_manager::*;

veilid-core/src/intf/native/system.rs

@@ -1,5 +1,6 @@
 #![allow(dead_code)]
-use crate::xx::*;
+
+use crate::*;
 
 pub async fn get_outbound_relay_peer() -> Option<crate::veilid_api::PeerInfo> {
     panic!("Native Veilid should never require an outbound relay");

veilid-core/src/intf/native/table_store.rs

@@ -1,5 +1,4 @@
 use crate::intf::table_db::*;
-use crate::xx::*;
 use crate::*;
 use keyvaluedb_sqlite::*;
 use std::path::PathBuf;

veilid-core/src/intf/native/utils/mod.rs

@@ -1,5 +0,0 @@
-#[cfg(target_os = "android")]
-pub mod android;
-#[cfg(all(target_os = "ios", feature = "ios_tests"))]
-pub mod ios_test_setup;
-pub mod network_interfaces;

veilid-core/src/intf/table_db.rs

@@ -1,4 +1,3 @@
-use crate::xx::*;
 use crate::*;
 use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
 

veilid-core/src/intf/wasm/block_store.rs

@@ -1,5 +1,3 @@
-
-use crate::xx::*;
 use crate::*;
 
 struct BlockStoreInner {

veilid-core/src/intf/wasm/protected_store.rs

@@ -1,8 +1,8 @@
 use super::*;
-use crate::xx::*;
 use crate::*;
 use data_encoding::BASE64URL_NOPAD;
 use rkyv::{Archive as RkyvArchive, Deserialize as RkyvDeserialize, Serialize as RkyvSerialize};
+
 use web_sys::*;
 
 #[derive(Clone)]

veilid-core/src/intf/wasm/system.rs

@@ -1,5 +1,3 @@
-use crate::xx::*;
-
 use async_executors::{Bindgen, LocalSpawnHandleExt, SpawnHandleExt, Timer};
 use futures_util::future::{select, Either};
 use js_sys::*;

veilid-core/src/intf/wasm/table_store.rs

@@ -1,7 +1,6 @@
 use super::*;
 
 use crate::intf::table_db::*;
-use crate::xx::*;
 use crate::*;
 use keyvaluedb_web::*;
 

veilid-core/src/intf/wasm/utils/mod.rs

@@ -1 +0,0 @@
-