From ceb2ee16c46515dbd46267c2c93f5cb8f8d7ea47 Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Wed, 14 Apr 2021 15:45:45 -0600
Subject: use full pattern matching for $(x:y%z=z%a) macro substitution

---
 src/makefile/mod.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/makefile/mod.rs')

diff --git a/src/makefile/mod.rs b/src/makefile/mod.rs
index 8c50f41..1d4873e 100644
--- a/src/makefile/mod.rs
+++ b/src/makefile/mod.rs
@@ -203,7 +203,7 @@ impl<'a> Makefile<'a> {
             .filter(|rule| rule.matches(name).unwrap_or(false));
         for rule in inference_rule_candidates {
             log::trace!(
-                "{:>58} considering rule to build {:?} from {:?}",
+                "{} considering rule to build {:?} from {:?}",
                 name,
                 &rule.products,
                 &rule.prerequisites
@@ -211,7 +211,6 @@ impl<'a> Makefile<'a> {
             // whose prerequisite file ($*.s2) exists.
             let prereq_paths = rule
                 .prereqs(name)?
-                .inspect(|x| log::trace!("{:>58} prereq {}", name, x))
                 .map(|prereq_path_name| {
                     if name == prereq_path_name || banned_names.contains(&&*prereq_path_name) {
                         // we can't build this based on itself! fuck outta here
@@ -250,7 +249,7 @@ impl<'a> Makefile<'a> {
                 })
                 .collect::<Option<Vec<String>>>();
             if let Some(prereqs) = prereq_paths {
-                log::trace!("oh {} is a {:#?}", name, rule);
+                log::trace!("oh {} is a {}", name, rule);
                 new_target = Some(Target {
                     name: name.into(),
                     prerequisites: prereqs,
-- 
cgit v1.2.3