From 784018124d13a4cfb050b8bf1fecd283cdc309db Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sat, 26 Jun 2021 15:35:37 +0200 Subject: Remove unused template name field --- src/eval/value.rs | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/eval/value.rs') diff --git a/src/eval/value.rs b/src/eval/value.rs index dda1c3e1..e8ecffa2 100644 --- a/src/eval/value.rs +++ b/src/eval/value.rs @@ -55,11 +55,11 @@ pub enum Value { impl Value { /// Create a new template value consisting of a single dynamic node. - pub fn template(name: impl Into, f: F) -> Self + pub fn template(f: F) -> Self where F: Fn(&mut ExecContext) + 'static, { - Self::Template(vec![TemplateNode::Func(TemplateFunc::new(name, f))]) + Self::Template(vec![TemplateNode::Func(TemplateFunc::new(f))]) } /// The name of the stored value's type. @@ -193,23 +193,15 @@ pub type ExprMap = HashMap<*const Expr, Value>; /// A reference-counted dynamic template node that can implement custom /// behaviour. #[derive(Clone)] -pub struct TemplateFunc { - name: String, - f: Rc, -} +pub struct TemplateFunc(Rc); impl TemplateFunc { /// Create a new function template from a rust function or closure. - pub fn new(name: impl Into, f: F) -> Self + pub fn new(f: F) -> Self where F: Fn(&mut ExecContext) + 'static, { - Self { name: name.into(), f: Rc::new(f) } - } - - /// The name of the template node. - pub fn name(&self) -> &str { - &self.name + Self(Rc::new(f)) } } @@ -224,7 +216,7 @@ impl Deref for TemplateFunc { type Target = dyn Fn(&mut ExecContext); fn deref(&self) -> &Self::Target { - self.f.as_ref() + self.0.as_ref() } } -- cgit v1.2.3