diff --git a/src/ui/app.rs b/src/ui/app.rs index 976118d..1345fc8 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -180,7 +180,7 @@ impl App { JobWorkerOut::Log(rows) => Msg::OnServiceLog(rows), JobWorkerOut::Exit(code) => Msg::OnServiceExit(code), }, - debug + debug, ); worker.start(); self.xrservice_worker = Some(worker); @@ -396,9 +396,7 @@ impl SimpleComponent for App { self.shutdown_xrservice(); } }, - Msg::StartWithDebug => { - self.start_xrservice(sender, true) - } + Msg::StartWithDebug => self.start_xrservice(sender, true), Msg::RestartXRService => match &mut self.xrservice_worker { None => { self.start_xrservice(sender, false); @@ -443,8 +441,12 @@ impl SimpleComponent for App { jobs.push_back(get_build_mercury_job(&profile)); } jobs.extend(match profile.xrservice_type { - XRServiceType::Monado => get_build_monado_jobs(&profile, clean_build, debug_build), - XRServiceType::Wivrn => get_build_wivrn_jobs(&profile, clean_build, debug_build), + XRServiceType::Monado => { + get_build_monado_jobs(&profile, clean_build, debug_build) + } + XRServiceType::Wivrn => { + get_build_wivrn_jobs(&profile, clean_build, debug_build) + } }); // no listed deps for opencomp } diff --git a/src/ui/job_worker/internal_worker.rs b/src/ui/job_worker/internal_worker.rs index 4dfc054..dd623e1 100644 --- a/src/ui/job_worker/internal_worker.rs +++ b/src/ui/job_worker/internal_worker.rs @@ -176,8 +176,14 @@ impl InternalJobWorker { "gdb -batch -ex run -ex bt --args", LAUNCH_OPTS_CMD_PLACEHOLDER, launch_opts ) } - } else {String::default()}; - launch_opts = if debug { debug_launch_opts.as_str() } else { launch_opts }; + } else { + String::default() + }; + launch_opts = if debug { + debug_launch_opts.as_str() + } else { + launch_opts + }; let (command, args) = match launch_opts.is_empty() { false => ( "sh".into(), diff --git a/src/ui/job_worker/mod.rs b/src/ui/job_worker/mod.rs index 5d0e33e..8c38e79 100644 --- a/src/ui/job_worker/mod.rs +++ b/src/ui/job_worker/mod.rs @@ -48,7 +48,7 @@ impl JobWorker { prof: &Profile, sender: &Sender, transform: F, - debug: bool + debug: bool, ) -> Self { let state = Arc::new(Mutex::new(JobWorkerState::default())); Self {