From 7e998f46d5a7067bc921f1038e914f47bc1607ab Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Sat, 27 Mar 2021 17:23:12 -0600 Subject: a couple more little things --- src/makefile/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/makefile/mod.rs') 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(¯o_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)) => { -- cgit v1.2.3