From 57e4222900de52da5ffe13933fbebe91fbd7bab9 Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Sun, 28 Mar 2021 16:15:42 -0600
Subject: almost finish implementing functions

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

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

diff --git a/src/makefile/mod.rs b/src/makefile/mod.rs
index 7610197..f3b7efa 100644
--- a/src/makefile/mod.rs
+++ b/src/makefile/mod.rs
@@ -23,7 +23,7 @@ mod token;
 use command_line::CommandLine;
 use conditional::{ConditionalLine, ConditionalState};
 use inference_rules::InferenceRule;
-use r#macro::{LookupInternal, MacroSet, MacroSource};
+use r#macro::{MacroSet, MacroSetLike, MacroSource};
 use target::Target;
 use token::{tokenize, Token, TokenString};
 
@@ -506,7 +506,7 @@ impl<'a> Makefile<'a> {
                     .filter(|prereq| {
                         self.get_target(prereq)
                             .borrow()
-                            .newer_than(&target)
+                            .newer_than(target)
                             .unwrap_or(false)
                     })
                     .cloned()
@@ -554,9 +554,7 @@ impl<'a> Makefile<'a> {
             macro_pieces.join(" ")
         };
 
-        let lookup_internal: Rc<dyn LookupInternal> = Rc::new(lookup_internal);
-        self.macros.lookup(Rc::downgrade(&lookup_internal));
-        self.macros.expand(text)
+        self.macros.with_lookup(&lookup_internal).expand(text)
     }
 }
 
-- 
cgit v1.2.3