diff --git a/Cargo.lock b/Cargo.lock index 0693fb90..ae43417e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1107,9 +1107,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0" dependencies = [ "generic-array 0.14.5", "typenum", @@ -1512,27 +1512,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "ethbloom" version = "0.12.1" @@ -1702,12 +1681,11 @@ dependencies = [ [[package]] name = "fs4" -version = "0.5.5" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15db7070ad11d5d652498c0b5d49428a3150ffe8c0c5b8d90a26030664e70ad0" +checksum = "cef5c93884e5cef757f63446122c2f420713c3e03f85540d09485b9415983b4a" dependencies = [ "libc", - "rustix", "winapi", ] @@ -2220,12 +2198,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "io-lifetimes" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" - [[package]] name = "ipconfig" version = "0.3.0" @@ -2493,12 +2465,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - [[package]] name = "lock_api" version = "0.4.7" @@ -3774,20 +3740,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.35.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef258c11e17f5c01979a10543a30a4e12faef6aab217a74266e747eefa3aed88" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - [[package]] name = "rustls" version = "0.19.1" diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index fcc0497a..558a15c2 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["cdylib", "staticlib", "rlib"] [features] default = [] rt-async-std = [ "async-std", "async-std-resolver", "async_executors/async_std", "rtnetlink?/smol_socket" ] -rt-tokio = [ "tokio", "tokio-util", "tokio-stream", "trust-dns-resolver?/tokio-runtime", "async_executors/tokio_tp", "async_executors/tokio_io", "async_executors/tokio_timer", "rtnetlink?/tokio_socket" ] +rt-tokio = [ "tokio", "tokio-util", "tokio-stream", "trust-dns-resolver/tokio-runtime", "async_executors/tokio_tp", "async_executors/tokio_io", "async_executors/tokio_timer", "rtnetlink?/tokio_socket" ] android_tests = [] ios_tests = [ "simplelog", "backtrace" ] @@ -55,6 +55,8 @@ rand = "0.7" blake3 = { version = "1.1.0", default_features = false } digest = "0.9.0" rtnetlink = { version = "^0", default-features = false, optional = true } +async-std-resolver = { version = "^0", optional = true } +trust-dns-resolver = { version = "^0", optional = true } # Dependencies for native builds only @@ -136,8 +138,6 @@ backtrace = { version = "^0" } # Dependenices for all Unix (Linux, Android, MacOS, iOS) [target.'cfg(unix)'.dependencies] ifstructs = "^0" -async-std-resolver = { version = "^0", optional = true } -trust-dns-resolver = { version = "^0", optional = true } # Dependencies for Linux or Android [target.'cfg(any(target_os = "android",target_os = "linux"))'.dependencies] diff --git a/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs b/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs index d43b2a6c..74f2f0b3 100644 --- a/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs +++ b/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs @@ -1,4 +1,5 @@ use super::*; +use crate::*; use alloc::collections::btree_map::Entry; use futures_util::stream::TryStreamExt;