This commit is contained in:
parent
49491823c3
commit
f0208c759b
23
Cargo.lock
generated
23
Cargo.lock
generated
@ -2302,7 +2302,6 @@ dependencies = [
|
|||||||
"serde 1.0.144",
|
"serde 1.0.144",
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
"serde_json 1.0.85",
|
"serde_json 1.0.85",
|
||||||
"serde_with",
|
|
||||||
"socket2 0.3.19",
|
"socket2 0.3.19",
|
||||||
"sodiumoxide",
|
"sodiumoxide",
|
||||||
"tokio",
|
"tokio",
|
||||||
@ -4588,28 +4587,6 @@ dependencies = [
|
|||||||
"serde 1.0.144",
|
"serde 1.0.144",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_with"
|
|
||||||
version = "1.14.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
|
|
||||||
dependencies = [
|
|
||||||
"serde 1.0.144",
|
|
||||||
"serde_with_macros",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_with_macros"
|
|
||||||
version = "1.5.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
|
|
||||||
dependencies = [
|
|
||||||
"darling",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_yaml"
|
name = "serde_yaml"
|
||||||
version = "0.8.26"
|
version = "0.8.26"
|
||||||
|
1
build.rs
1
build.rs
@ -76,6 +76,7 @@ fn install_oboe() {
|
|||||||
//cc::Build::new().file("oboe.cc").include(include).compile("oboe_wrapper");
|
//cc::Build::new().file("oboe.cc").include(include).compile("oboe_wrapper");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "flutter")]
|
||||||
fn gen_flutter_rust_bridge() {
|
fn gen_flutter_rust_bridge() {
|
||||||
let llvm_path = match std::env::var("LLVM_HOME") {
|
let llvm_path = match std::env::var("LLVM_HOME") {
|
||||||
Ok(path) => Some(vec![path]),
|
Ok(path) => Some(vec![path]),
|
||||||
|
@ -23,7 +23,6 @@ directories-next = "2.0"
|
|||||||
rand = "0.8"
|
rand = "0.8"
|
||||||
serde_derive = "1.0"
|
serde_derive = "1.0"
|
||||||
serde = "1.0"
|
serde = "1.0"
|
||||||
serde_with = "1.14.0"
|
|
||||||
lazy_static = "1.4"
|
lazy_static = "1.4"
|
||||||
confy = { git = "https://github.com/open-trade/confy" }
|
confy = { git = "https://github.com/open-trade/confy" }
|
||||||
dirs-next = "2.0"
|
dirs-next = "2.0"
|
||||||
|
@ -956,13 +956,18 @@ impl LocalConfig {
|
|||||||
|
|
||||||
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
|
||||||
pub struct DiscoveryPeer {
|
pub struct DiscoveryPeer {
|
||||||
|
#[serde(default)]
|
||||||
pub id: String,
|
pub id: String,
|
||||||
#[serde(with = "serde_with::rust::map_as_tuple_list")]
|
#[serde(default)]
|
||||||
pub ip_mac: HashMap<String, String>,
|
|
||||||
pub username: String,
|
pub username: String,
|
||||||
|
#[serde(default)]
|
||||||
pub hostname: String,
|
pub hostname: String,
|
||||||
|
#[serde(default)]
|
||||||
pub platform: String,
|
pub platform: String,
|
||||||
|
#[serde(default)]
|
||||||
pub online: bool,
|
pub online: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub ip_mac: HashMap<String, String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DiscoveryPeer {
|
impl DiscoveryPeer {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user