Skip to content

Commit f604c90

Browse files
committed
Use while-let
1 parent 363afa5 commit f604c90

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/maxminddb/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ impl<'de, T: Deserialize<'de>, S: AsRef<[u8]>> Iterator for Within<'de, T, S> {
100100
type Item = Result<WithinItem<T>, MaxMindDBError>;
101101

102102
fn next(&mut self) -> Option<Self::Item> {
103-
while !self.stack.is_empty() {
104-
let current = self.stack.pop().unwrap();
103+
while let Some(current) = self.stack.pop() {
105104
let bit_count = current.ip_bytes.len() * 8;
106105

107106
// Skip networks that are aliases for the IPv4 network

src/maxminddb/reader_test.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,7 @@ fn test_within_city() {
399399
IpNetwork::V4("81.2.69.144/28".parse().unwrap()),
400400
IpNetwork::V4("81.2.69.142/31".parse().unwrap()),
401401
];
402-
while !expected.is_empty() {
403-
let e = expected.pop().unwrap();
402+
while let Some(e) = expected.pop() {
404403
let item = iter.next().unwrap().unwrap();
405404
assert_eq!(item.ip_net, e);
406405
}

0 commit comments

Comments
 (0)