Tiny refactor in main runloop

This is no functional change, it just reorders the run/no-run blocks to reduce indentation. This will make my next PR easier to read.
googlefonts · Jul 13, 2023 · 580f2b8 · 580f2b8
1 parent 30a0270
commit 580f2b8
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/fontc/src/workload.rs b/fontc/src/workload.rs
@@ -212,28 +212,28 @@ impl<'a> Workload<'a> {
                         .work
                         .take()
                         .expect("{id:?} ready to run but has no work?!");
-                    if job.run {
-                        let work_context = AnyContext::for_work(
-                            fe_root,
-                            be_root,
-                            &id,
-                            job.read_access.clone(),
-                            job.write_access.clone(),
-                        );
-
-                        scope.spawn(move |_| {
-                            let result = work.exec(work_context);
-                            if let Err(e) = send.send((id.clone(), result)) {
-                                log::error!(
-                                    "Unable to write {:?} to completion channel: {}",
-                                    id,
-                                    e
-                                );
-                            }
-                        })
-                    } else if let Err(e) = send.send((id.clone(), Ok(()))) {
-                        log::error!("Unable to write nop {:?} to completion channel: {}", id, e);
+                    if !job.run {
+                        if let Err(e) = send.send((id.clone(), Ok(()))) {
+                            log::error!("Unable to write nop {id:?} to completion channel: {e}");
+                            //FIXME: if we can't send messages it means the receiver has dropped,
+                            //which means we should... return? abort?
+                        }
+                        continue;
                     }
+                    let work_context = AnyContext::for_work(
+                        fe_root,
+                        be_root,
+                        &id,
+                        job.read_access.clone(),
+                        job.write_access.clone(),
+                    );
+
+                    scope.spawn(move |_| {
+                        let result = work.exec(work_context);
+                        if let Err(e) = send.send((id.clone(), result)) {
+                            log::error!("Unable to write {id:?} to completion channel: {e}");
+                        }
+                    })
                 }
 
                 // Block for things to phone home to say they are done