ninja: introduce NinjaBuildBuilder::from_rule()

kaspar030 · Jan 5, 2024 · e5734b0 · e5734b0
1 parent 9499c3f
commit e5734b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/generate.rs b/src/generate.rs
@@ -731,8 +731,7 @@ fn configure_build(
 
             // 4. render ninja "build:" snippet and add to this build's
             // ninja statement set
-            let build = NinjaBuildBuilder::default()
-                .with_rule(&rule)
+            let build = NinjaBuildBuilder::from_rule(&rule)
                 .inputs(sources)
                 .outs(outs.clone())
                 .deps(combined_build_deps)
@@ -830,8 +829,7 @@ fn configure_build(
 
                 // 4. render ninja "build:" snippet and add to this build's
                 // ninja statement set
-                let build = NinjaBuildBuilder::default()
-                    .with_rule(&ninja_rule)
+                let build = NinjaBuildBuilder::from_rule(&ninja_rule)
                     .input(Cow::from(srcpath.as_path()))
                     .deps(combined_build_deps.clone())
                     .out(object.as_path())
@@ -903,8 +901,7 @@ fn configure_build(
     {
         let ninja_link_rule = render_rule_with(get_rule("LINK", rules)?, &global_env_flattened);
         // build ninja link target
-        let ninja_link_build = NinjaBuildBuilder::default()
-            .with_rule(&ninja_link_rule)
+        let ninja_link_build = NinjaBuildBuilder::from_rule(&ninja_link_rule)
             .inputs(objects)
             .deps(global_build_dep_files)
             .out(outfile.as_path())
@@ -924,8 +921,7 @@ fn configure_build(
                     anyhow!("POST_LINK rule has no \"out\" extension configured")
                 })?);
                 let post_link_rule = render_rule_with(rule, &global_env_flattened);
-                let post_link_build = NinjaBuildBuilder::default()
-                    .with_rule(&post_link_rule)
+                let post_link_build = NinjaBuildBuilder::from_rule(&post_link_rule)
                     .input(outfile)
                     .out(new_outfile.as_path())
                     .build()

diff --git a/src/ninja/mod.rs b/src/ninja/mod.rs
@@ -167,6 +167,12 @@ impl<'a> NinjaBuildBuilder<'a> {
     pub fn with_rule(&mut self, rule: &'a NinjaRule) -> &mut Self {
         self.rule(&*rule.name).always(rule.always)
     }
+
+    pub fn from_rule(rule: &'a NinjaRule) -> Self {
+        let mut res = Self::default();
+        res.with_rule(rule);
+        res
+    }
 }
 
 impl<'a> fmt::Display for NinjaBuild<'a> {