From 8c775b40396b20a8a928a45078e0093ce35ddf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 10 Jan 2025 09:51:04 +0200 Subject: [PATCH] Fix some new clippy warnings --- glib/src/variant.rs | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/glib/src/variant.rs b/glib/src/variant.rs index df8f0e1ca7a6..0712b284341f 100644 --- a/glib/src/variant.rs +++ b/glib/src/variant.rs @@ -1441,14 +1441,8 @@ where for i in 0..variant.n_children() { let entry = variant.child_value(i); - let key = match entry.child_value(0).get() { - Some(key) => key, - None => return None, - }; - let val = match entry.child_value(1).get() { - Some(val) => val, - None => return None, - }; + let key = entry.child_value(0).get()?; + let val = entry.child_value(1).get()?; map.insert(key, val); } @@ -1471,14 +1465,8 @@ where for i in 0..variant.n_children() { let entry = variant.child_value(i); - let key = match entry.child_value(0).get() { - Some(key) => key, - None => return None, - }; - let val = match entry.child_value(1).get() { - Some(val) => val, - None => return None, - }; + let key = entry.child_value(0).get()?; + let val = entry.child_value(1).get()?; map.insert(key, val); } @@ -1646,14 +1634,8 @@ where return None; } - let key = match variant.child_value(0).get() { - Some(key) => key, - None => return None, - }; - let value = match variant.child_value(1).get() { - Some(value) => value, - None => return None, - }; + let key = variant.child_value(0).get()?; + let value = variant.child_value(1).get()?; Some(Self { key, value }) }