Don't ignore default jobs = N in Werkfile (#75)

Author: simonask

werk-cli/main.rs

@@ -674,19 +674,19 @@ pub fn get_workspace_dir<'a>(
 }
 
 pub fn get_workspace_settings(
-    config: &werk_runner::ir::Defaults,
+    defaults: &werk_runner::ir::Defaults,
     args: &Args,
     workspace_dir: &Absolute<std::path::Path>,
     color_stdout: ColorOutputKind,
 ) -> Result<WorkspaceSettings, Error> {
     let out_dir = find_output_directory(
         workspace_dir,
         args.output_dir.as_deref(),
-        config.output_directory.as_deref(),
+        defaults.output_directory.as_deref(),
     )?;
 
     let mut settings = WorkspaceSettings::new(workspace_dir.to_owned());
-    settings.jobs = args.jobs.unwrap_or_else(num_cpus::get);
+    settings.jobs = args.jobs.or(defaults.jobs).unwrap_or_else(num_cpus::get);
     settings.output_directory = out_dir;
     for def in &args.define {
         let Some((key, value)) = def.split_once('=') else {

werk-runner/ir.rs

@@ -190,7 +190,7 @@ pub struct Defaults {
     pub explain: Option<bool>,
     pub verbose: Option<bool>,
     pub watch_delay: Option<i32>,
-    pub jobs: Option<i32>,
+    pub jobs: Option<usize>,
     pub edition: Edition,
 }
 
@@ -216,7 +216,7 @@ impl Defaults {
                 ast::DefaultStmt::Explain(entry) => defaults.explain = Some(entry.value.1),
                 ast::DefaultStmt::Verbose(entry) => defaults.verbose = Some(entry.value.1),
                 ast::DefaultStmt::WatchDelay(entry) => defaults.watch_delay = Some(entry.value.1),
-                ast::DefaultStmt::Jobs(entry) => defaults.jobs = Some(entry.value.1),
+                ast::DefaultStmt::Jobs(entry) => defaults.jobs = entry.value.1.try_into().ok(),
                 ast::DefaultStmt::Edition(entry) => {
                     if entry.value.1 == "v1" {
                         defaults.edition = Edition::V1;