Merge branch 'main' of https://github.com/thewh1teagle/vibe

thewh1teagle · Jul 11, 2024 · 75a4674 · 75a4674
2 parents 0cf250c + 9421c0a
commit 75a4674
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -34,15 +34,10 @@
     ],
     "i18n-ally.pathMatcher": "{locale}/{namespace}.json",
     "i18n-ally.tabStyle": "tab",
-    "rust-analyzer.runnables.extraEnv": [
-        {
-            "platform": "win32",
-            "env": {
-                "FFMPEG_DIR": "C:\\Users\\User\\Documents\\code\\vibe\\desktop\\src-tauri\\ffmpeg",
-                "OPENBLAS_PATH": "C:\\Users\\User\\Documents\\code\\vibe\\desktop\\src-tauri\\openblas",
-                "CLBlast_DIR": "C:\\Users\\User\\Documents\\code\\vibe\\desktop\\src-tauri\\clblast",
-                "LIBCLANG_PATH": "C:\\Program Files\\LLVM\\bin"
-            }
-        }
-    ]
+    "rust-analyzer.cargo.extraEnv": {
+        "FFMPEG_DIR": "${workspaceFolder}\\desktop\\src-tauri\\ffmpeg",
+        "OPENBLAS_PATH": "${workspaceFolder}\\desktop\\src-tauri\\openblas",
+        "CLBlast_DIR": "${workspaceFolder}\\desktop\\src-tauri\\clblast",
+        "LIBCLANG_PATH": "C:\\Program Files\\LLVM\\bin"
+    },
 }
diff --git a/desktop/src-tauri/src/setup.rs b/desktop/src-tauri/src/setup.rs
@@ -45,7 +45,7 @@ pub fn setup(app: &App) -> Result<(), Box<dyn std::error::Error>> {
     log::debug!(
         "CPU Features\n{}",
         crate::cmd::get_x86_features()
-            .map(|v| serde_json::to_string(&v)?)
+            .map(|v| serde_json::to_string(&v).unwrap_or_default())
             .unwrap_or_default()
     );