Skip to content

Commit 27f64cd

Browse files
sdroegebilelmoussaoui
authored andcommitted
Fix some new clippy warnings
1 parent ced2343 commit 27f64cd

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

glib/src/variant.rs

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,14 +1441,8 @@ where
14411441

14421442
for i in 0..variant.n_children() {
14431443
let entry = variant.child_value(i);
1444-
let key = match entry.child_value(0).get() {
1445-
Some(key) => key,
1446-
None => return None,
1447-
};
1448-
let val = match entry.child_value(1).get() {
1449-
Some(val) => val,
1450-
None => return None,
1451-
};
1444+
let key = entry.child_value(0).get()?;
1445+
let val = entry.child_value(1).get()?;
14521446

14531447
map.insert(key, val);
14541448
}
@@ -1471,14 +1465,8 @@ where
14711465

14721466
for i in 0..variant.n_children() {
14731467
let entry = variant.child_value(i);
1474-
let key = match entry.child_value(0).get() {
1475-
Some(key) => key,
1476-
None => return None,
1477-
};
1478-
let val = match entry.child_value(1).get() {
1479-
Some(val) => val,
1480-
None => return None,
1481-
};
1468+
let key = entry.child_value(0).get()?;
1469+
let val = entry.child_value(1).get()?;
14821470

14831471
map.insert(key, val);
14841472
}
@@ -1646,14 +1634,8 @@ where
16461634
return None;
16471635
}
16481636

1649-
let key = match variant.child_value(0).get() {
1650-
Some(key) => key,
1651-
None => return None,
1652-
};
1653-
let value = match variant.child_value(1).get() {
1654-
Some(value) => value,
1655-
None => return None,
1656-
};
1637+
let key = variant.child_value(0).get()?;
1638+
let value = variant.child_value(1).get()?;
16571639

16581640
Some(Self { key, value })
16591641
}

0 commit comments

Comments
 (0)