Merge branch 'main' into dependabot/cargo/serde-1.0.210

shinolab · Sep 18, 2024 · b6b396a · b6b396a
2 parents 94a8028 + 2c87975
commit b6b396a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/SOEMAUTDServer/Cargo.toml b/SOEMAUTDServer/Cargo.toml
@@ -11,12 +11,12 @@ readme = "README.md"
 keywords = ["autd"]
 
 [dependencies]
-clap = { version = "4.5.16", features = ["derive"] }
+clap = { version = "4.5.17", features = ["derive"] }
 tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
 autd3-protobuf = { version = "27.0.0", features = ["lightweight", "async-trait"] }
 autd3-link-soem = { version = "27.0.0", features = ["async-trait"] }
 autd3-driver = { version = "27.0.0", features = ["async-trait"] }
-anyhow = "1.0.72"
+anyhow = "1.0.89"
 ctrlc = "3.4.5"
 tonic = "0.12.2"
 tracing = "0.1.37"

diff --git a/TwinCATAUTDServerLightweight/Cargo.toml b/TwinCATAUTDServerLightweight/Cargo.toml
@@ -11,11 +11,11 @@ readme = "README.md"
 keywords = ["autd"]
 
 [dependencies]
-clap = { version = "4.5.16", features = ["derive"] }
+clap = { version = "4.5.17", features = ["derive"] }
 tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
 autd3-protobuf = { version = "27.0.0", features = ["lightweight", "async-trait"] }
 autd3-link-twincat = { version = "27.0.0", features = ["async-trait"] }
-anyhow = "1.0.72"
+anyhow = "1.0.89"
 ctrlc = "3.4.5"
 tonic = "0.12.2"
 tracing = "0.1.37"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "svelte-preprocess": "^6.0.2",
     "tslib": "^2.7.0",
     "svelte": "^4.2.19",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "vite": "^4.4.4",
     "@tauri-apps/cli": "^1.6.1"
   }

diff --git a/simulator/Cargo.toml b/simulator/Cargo.toml
@@ -19,12 +19,12 @@ bitflags = "2.3.1"
 bytemuck = { version = "1.18.0", features = ["derive", "extern_crate_std", "min_const_generics"] }
 camera_controllers = "0.34.0"
 cgmath = "0.18.0"
-clap = { version = "4.5.16", features = ["derive"] }
+clap = { version = "4.5.17", features = ["derive"] }
 png = "0.17.8"
 imgui = "0.12.0"
 scarlet = "1.2.0"
-serde_json = "1.0.127"
 serde = { version = "1.0.210", features = ["derive"] }
+serde_json = "1.0.128"
 vulkano = "0.34.1"
 vulkano-shaders = "0.34.0"
 winit = "0.28.6"
@@ -33,7 +33,7 @@ image = "0.25.2"
 tokio = { version = "1.40.0", features = ["rt-multi-thread"] }
 futures-util = "0.3.28"
 tonic = "0.12.2"
-anyhow = "1.0.83"
+anyhow = "1.0.89"
 chrono = "0.4.38"
 gltf = "1.4.1"
 tracing-subscriber = "0.3.17"

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -58,10 +58,7 @@ async fn load_settings(handle: tauri::AppHandle) -> Result<Options, String> {
         file.read_to_string(&mut contents)
             .await
             .map_err(|e| e.to_string())?;
-        match serde_json::from_str(&contents) {
-            Ok(options) => options,
-            Err(_) => Default::default(),
-        }
+        serde_json::from_str(&contents).unwrap_or_default()
     } else {
         Default::default()
     };