From 7e998f46d5a7067bc921f1038e914f47bc1607ab Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Sat, 27 Mar 2021 17:23:12 -0600
Subject: a couple more little things

---
 src/makefile/mod.rs    | 5 +++--
 src/makefile/target.rs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/makefile/mod.rs b/src/makefile/mod.rs
index d57bbf4..34dac04 100644
--- a/src/makefile/mod.rs
+++ b/src/makefile/mod.rs
@@ -547,8 +547,9 @@ impl<'a> Makefile<'a> {
                     } else {
                         self.macros
                             .get(name)
-                            .map(|(_, macro_value)| self.expand_macros(&macro_value, target))
-                            .unwrap_or_else(String::new)
+                            .map_or_else(String::new, |(_, macro_value)| {
+                                self.expand_macros(macro_value, target)
+                            })
                     };
                     let macro_value = match replacement {
                         Some((subst1, subst2)) => {
diff --git a/src/makefile/target.rs b/src/makefile/target.rs
index 443eee5..eb181cd 100644
--- a/src/makefile/target.rs
+++ b/src/makefile/target.rs
@@ -22,7 +22,7 @@ impl Target {
             .ok()
     }
 
-    pub(crate) fn newer_than(&self, other: &Target) -> Option<bool> {
+    pub(crate) fn newer_than(&self, other: &Self) -> Option<bool> {
         let self_updated = self.already_updated.get();
         let other_updated = other.already_updated.get();
         Some(match (self.modified_time(), other.modified_time()) {
-- 
cgit v1.2.3