mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-03 14:49:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: format

Browse source
This commit is contained in:
Gabriele Musco 2023-10-08 00:07:58 +02:00
commit 244a2cfff1
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ui/app.rs
View file

@ -180,7 +180,7 @@ impl App {
JobWorkerOut::Log(rows) => Msg::OnServiceLog(rows), JobWorkerOut::Log(rows) => Msg::OnServiceLog(rows),
JobWorkerOut::Exit(code) => Msg::OnServiceExit(code), JobWorkerOut::Exit(code) => Msg::OnServiceExit(code),
}, },
debug debug,
); );
worker.start(); worker.start();
self.xrservice_worker = Some(worker); self.xrservice_worker = Some(worker);
@ -396,9 +396,7 @@ impl SimpleComponent for App {
self.shutdown_xrservice(); self.shutdown_xrservice();
} }
}, },
Msg::StartWithDebug => { Msg::StartWithDebug => self.start_xrservice(sender, true),
self.start_xrservice(sender, true)
}
Msg::RestartXRService => match &mut self.xrservice_worker { Msg::RestartXRService => match &mut self.xrservice_worker {
None => { None => {
self.start_xrservice(sender, false); self.start_xrservice(sender, false);
@ -443,8 +441,12 @@ impl SimpleComponent for App {
jobs.push_back(get_build_mercury_job(&profile)); jobs.push_back(get_build_mercury_job(&profile));
} }
jobs.extend(match profile.xrservice_type { jobs.extend(match profile.xrservice_type {
XRServiceType::Monado => get_build_monado_jobs(&profile, clean_build, debug_build), XRServiceType::Monado => {
XRServiceType::Wivrn => get_build_wivrn_jobs(&profile, clean_build, debug_build), 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 // no listed deps for opencomp
} }

10
src/ui/job_worker/internal_worker.rs
View file

@ -176,8 +176,14 @@ impl InternalJobWorker {
"gdb -batch -ex run -ex bt --args", LAUNCH_OPTS_CMD_PLACEHOLDER, launch_opts "gdb -batch -ex run -ex bt --args", LAUNCH_OPTS_CMD_PLACEHOLDER, launch_opts
) )
} }
} else {String::default()}; } else {
launch_opts = if debug { debug_launch_opts.as_str() } else { launch_opts }; String::default()
};
launch_opts = if debug {
debug_launch_opts.as_str()
} else {
launch_opts
};
let (command, args) = match launch_opts.is_empty() { let (command, args) = match launch_opts.is_empty() {
false => ( false => (
"sh".into(), "sh".into(),

2
src/ui/job_worker/mod.rs
View file

@ -48,7 +48,7 @@ impl JobWorker {
prof: &Profile, prof: &Profile,
sender: &Sender<X>, sender: &Sender<X>,
transform: F, transform: F,
debug: bool debug: bool,
) -> Self { ) -> Self {
let state = Arc::new(Mutex::new(JobWorkerState::default())); let state = Arc::new(Mutex::new(JobWorkerState::default()));
Self { Self {