From 330e2ef471e07dbb242bf402001f69e5c0cd2701 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 8 Feb 2017 19:46:12 +0100 Subject: Simplify code to find template path --- askama_derive/src/lib.rs | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'askama_derive') diff --git a/askama_derive/src/lib.rs b/askama_derive/src/lib.rs index 59d1ae1..244c43b 100644 --- a/askama_derive/src/lib.rs +++ b/askama_derive/src/lib.rs @@ -4,32 +4,19 @@ extern crate syn; use proc_macro::TokenStream; -fn get_path_from_attrs(attrs: &Vec) -> String { - for attr in attrs { - if attr.name() == "template" { - match attr.value { - syn::MetaItem::List(_, ref inner) => { - match inner[0] { - syn::NestedMetaItem::MetaItem(ref item) => { - match item { - &syn::MetaItem::NameValue(ref key, ref val) => { - assert_eq!(key.as_ref(), "path"); - match val { - &syn::Lit::Str(ref s, _) => { return s.clone(); }, - _ => panic!("template path must be a string"), - } - }, - _ => panic!("template annotation must contain key/value pair"), - } - }, - _ => panic!("template annotation must contain item"), - } - }, - _ => panic!("template annotation must be of List type"), +fn get_path_from_attrs(attrs: &[syn::Attribute]) -> String { + let attr = attrs.iter().find(|a| a.name() == "template").unwrap(); + if let syn::MetaItem::List(_, ref inner) = attr.value { + if let syn::NestedMetaItem::MetaItem(ref item) = inner[0] { + if let &syn::MetaItem::NameValue(ref key, ref val) = item { + assert_eq!(key.as_ref(), "path"); + if let &syn::Lit::Str(ref s, _) = val { + return s.clone(); + } } } } - panic!("template annotation not found"); + panic!("template path not found in struct attributes"); } #[proc_macro_derive(Template, attributes(template))] -- cgit