aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMelody Horn <melody@boringcactus.com>2021-03-27 17:23:12 -0600
committerMelody Horn <melody@boringcactus.com>2021-03-27 17:23:12 -0600
commit7e998f46d5a7067bc921f1038e914f47bc1607ab (patch)
tree8c9f593a09c4dc2974ddf78dca07a28dbef7ded9 /src
parentd790f408294a7426460339a477026fd6d4400286 (diff)
downloadmakers-7e998f46d5a7067bc921f1038e914f47bc1607ab.tar.gz
makers-7e998f46d5a7067bc921f1038e914f47bc1607ab.zip
a couple more little things
Diffstat (limited to 'src')
-rw-r--r--src/makefile/mod.rs5
-rw-r--r--src/makefile/target.rs2
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()) {