From f14a3edd7dbee441fc315580fa2f782eea7c84e2 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Thu, 9 Aug 2018 13:49:47 +0000 Subject: [PATCH] style: Use function pointer rather than Fn trait object for collect_property_completion_keywords. Differential Revision: https://phabricator.services.mozilla.com/D2985 --- components/style/properties/properties.mako.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index df0b4655702..64e99ba205d 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -603,16 +603,17 @@ impl NonCustomPropertyId { /// See PropertyId::collect_property_completion_keywords. fn collect_property_completion_keywords(&self, f: KeywordsCollectFn) { - const COLLECT_FUNCTIONS: [&Fn(KeywordsCollectFn); + fn do_nothing(_: KeywordsCollectFn) {} + const COLLECT_FUNCTIONS: [fn(KeywordsCollectFn); ${len(data.longhands) + len(data.shorthands)}] = [ % for prop in data.longhands: - &<${prop.specified_type()} as SpecifiedValueInfo>::collect_completion_keywords, + <${prop.specified_type()} as SpecifiedValueInfo>::collect_completion_keywords, % endfor % for prop in data.shorthands: % if prop.name == "all": - &|_f| {}, // 'all' accepts no value other than CSS-wide keywords + do_nothing, // 'all' accepts no value other than CSS-wide keywords % else: - &:: + :: collect_completion_keywords, % endif % endfor