This commit is contained in:
QuantumEntangledAndy committed 2023-10-03 18:15:23 +07:00
1 parent c09bc13598
commit fa4ebc436f
3 files changed
+32 -7

No files matched your search

Generated
+30 -5
View File
@@ -1667,7 +1667,7 @@ dependencies = [
"tokio",
"tokio-stream",
"tokio-util",
"toml",
"toml 0.8.2",
"validator",
"validator_derive",
"yaserde",
@@ -1964,7 +1964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
"toml_edit",
"toml_edit 0.19.14",
]
[[package]]
@@ -2068,7 +2068,7 @@ dependencies = [
"regex",
"serde",
"tokio",
"toml",
"toml 0.7.6",
"validator",
"validator_derive",
]
@@ -2668,7 +2668,7 @@ dependencies = [
"cfg-expr",
"heck",
"pkg-config",
"toml",
"toml 0.7.6",
"version-compare",
]
@@ -2918,7 +2918,19 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
"toml_edit 0.19.14",
]
[[package]]
name = "toml"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.20.2",
]
[[package]]
@@ -2943,6 +2955,19 @@ dependencies = [
"winnow",
]
[[package]]
name = "toml_edit"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [
"indexmap 2.0.0",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
[[package]]
name = "tonic"
version = "0.9.2"
+1 -1
View File
@@ -38,7 +38,7 @@ serde_json = "1.0.96"
tokio = { version = "1.27.0", features = ["rt-multi-thread", "macros", "io-util", "tracing"] }
tokio-stream = "0.1.12"
tokio-util = { version = "0.7.7", features = ["full", "tracing"] }
toml = "0.7.3"
toml = "0.8.1"
validator = "0.16.0"
validator_derive = "0.16.0"
yaserde = "0.8.0"
+1 -1
View File
@@ -99,7 +99,7 @@ impl NeoInstance {
_ = self.cancel.cancelled() => {
Some(Err(anyhow!("Camera is disconnecting")))
}
v = camera_watch.wait_for(|new_cam| !Weak::ptr_eq(new_cam, &camera.as_ref().map(Arc::downgrade).unwrap_or_else(Weak::new))).map_ok(|new_cam| new_cam.upgrade()) => {
v = camera_watch.wait_for(|new_cam| !Weak::ptr_eq(new_cam, &camera.as_ref().map(Arc::downgrade).unwrap_or_default())).map_ok(|new_cam| new_cam.upgrade()) => {
// Camera value has changed!
// update and try again
if let Ok(new_cam) = v {