From e49cabfd43c1514a29cb7fa2903ee98b8de5b8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 30 Oct 2018 22:28:36 +0100 Subject: [PATCH] ir: Cleanup get_items. --- src/bindgen/ir/item.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/bindgen/ir/item.rs b/src/bindgen/ir/item.rs index ee1ffd5..e63a68b 100644 --- a/src/bindgen/ir/item.rs +++ b/src/bindgen/ir/item.rs @@ -140,11 +140,10 @@ impl ItemMap { } pub fn get_items(&self, path: &Path) -> Option> { - match self.data.get(path) { - Some(&ItemValue::Cfg(ref items)) => Some(items.iter().map(|x| x.container()).collect()), - Some(&ItemValue::Single(ref item)) => Some(vec![item.container()]), - None => None, - } + Some(match *self.data.get(path)? { + ItemValue::Cfg(ref items) => items.iter().map(|x| x.container()).collect(), + ItemValue::Single(ref item) => vec![item.container()], + }) } pub fn filter(&mut self, callback: F)