hugo/RuDS
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from rfc1437/codex/run-full-test-suite-after-fixing-internet

Browse Source 
Fix workspace test build on latest Rust
This commit is contained in:
Georg Bauer
2026-07-21 13:47:07 +02:00
committed by GitHub
parent 1ecd7a32d2 18d96a10b8
commit 9d3a092359
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bds-core/src/engine/git.rs
View File

@@ -915,7 +915,7 @@ fn terminate_child(child: &mut std::process::Child) {
let _ = child.kill(); let _ = child.kill();
} }
fn prepend_tool_paths(command: &mut Command) { fn prepend_tool_paths(_command: &mut Command) {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
let mut paths = vec![ let mut paths = vec![

5
crates/bds-core/src/engine/search.rs
View File

@@ -203,8 +203,9 @@ fn index_project(
current: &mut usize, current: &mut usize,
on_item: Option<&ItemProgressFn>, on_item: Option<&ItemProgressFn>,
) -> EngineResult<ReindexReport> { ) -> EngineResult<ReindexReport> {
let main_language = data_path let data_dir = data_path.map(Path::new);
.and_then(|path| crate::engine::meta::read_project_json(Path::new(path)).ok()) let main_language = data_dir
.and_then(|path| crate::engine::meta::read_project_json(path).ok())
.and_then(|metadata| metadata.main_language) .and_then(|metadata| metadata.main_language)
.unwrap_or_else(|| "en".to_string()); .unwrap_or_else(|| "en".to_string());
let mut report = ReindexReport { let mut report = ReindexReport {

2
crates/bds-package-runtime/src/main.rs
View File

@@ -73,6 +73,8 @@ fn main() -> Result<(), Box<dyn Error>> {
} }
fn sign_app_for_dmg(workspace: &Path) -> Result<(), Box<dyn Error>> { fn sign_app_for_dmg(workspace: &Path) -> Result<(), Box<dyn Error>> {
#[cfg(not(target_os = "macos"))]
let _ = workspace;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
if env::var_os("CARGO_PACKAGER_FORMAT").as_deref() == Some(OsStr::new("dmg")) { if env::var_os("CARGO_PACKAGER_FORMAT").as_deref() == Some(OsStr::new("dmg")) {
let target = env::var_os("CARGO_TARGET_DIR") let target = env::var_os("CARGO_TARGET_DIR")

7
crates/bds-ui/src/app.rs
View File

@@ -79,6 +79,7 @@ pub enum OneShotAiAction {
MediaTranslation { target_language: String }, MediaTranslation { target_language: String },
} }
#[derive(Debug, Clone)]
pub enum Message { pub enum Message {
// Menu // Menu
MenuEvent(muda::MenuId), MenuEvent(muda::MenuId),
@@ -9184,7 +9185,7 @@ impl BdsApp {
} }
fn run_media_ai_analysis(&mut self, media_id: &str) -> Task<Message> { fn run_media_ai_analysis(&mut self, media_id: &str) -> Task<Message> {
let Some(db) = &self.db else { let Some(_db) = &self.db else {
self.notify( self.notify(
ToastLevel::Error, ToastLevel::Error,
&t(self.ui_locale, "common.databaseUnavailable"), &t(self.ui_locale, "common.databaseUnavailable"),
@@ -9235,7 +9236,7 @@ impl BdsApp {
} }
fn detect_media_language(&mut self, media_id: &str) -> Task<Message> { fn detect_media_language(&mut self, media_id: &str) -> Task<Message> {
let Some(db) = &self.db else { let Some(_db) = &self.db else {
self.notify( self.notify(
ToastLevel::Error, ToastLevel::Error,
&t(self.ui_locale, "common.databaseUnavailable"), &t(self.ui_locale, "common.databaseUnavailable"),
@@ -9292,7 +9293,7 @@ impl BdsApp {
fn translate_media_to(&mut self, media_id: &str, target_language: &str) -> Task<Message> { fn translate_media_to(&mut self, media_id: &str, target_language: &str) -> Task<Message> {
self.active_modal = None; self.active_modal = None;
let Some(db) = &self.db else { let Some(_db) = &self.db else {
self.notify( self.notify(
ToastLevel::Error, ToastLevel::Error,
&t(self.ui_locale, "common.databaseUnavailable"), &t(self.ui_locale, "common.databaseUnavailable"),

4
crates/bds-ui/src/platform/script_host.rs
View File

@@ -4,7 +4,7 @@ use std::process::{Command, Stdio};
use std::sync::{Arc, Mutex, OnceLock}; use std::sync::{Arc, Mutex, OnceLock};
use bds_core::scripting::AppHostHandler; use bds_core::scripting::AppHostHandler;
use serde_json::{Value, json}; use serde_json::Value;
use super::menu::MenuAction; use super::menu::MenuAction;
@@ -123,7 +123,7 @@ mod tests {
#[test] #[test]
fn desktop_handler_queues_supported_menu_actions() { fn desktop_handler_queues_supported_menu_actions() {
let queued = Arc::new(Mutex::new(Vec::new())); let queued = Arc::new(Mutex::new(Vec::new()));
handler(Arc::clone(&queued), String::new())("trigger_menu_action", &[json!("new_post")]) handler(Arc::clone(&queued), String::new())("trigger_menu_action", &[serde_json::json!("new_post")])
.unwrap(); .unwrap();
assert_eq!(queued.lock().unwrap().as_slice(), &[MenuAction::NewPost]); assert_eq!(queued.lock().unwrap().as_slice(), &[MenuAction::NewPost]);
} }