Skip to content

Commit 6db1186

Browse files
LicenserLicenser
committed
make clippy happy
Signed-off-by: Heinz N. Gies <heinz@licenser.net>
1 parent e05884f commit 6db1186

File tree

5 files changed

+16
-47
lines changed

5 files changed

+16
-47
lines changed

‎src/serde/value/owned/de.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,11 +670,8 @@ impl<'de> de::Deserializer<'de> for &'de Value {
670670
let (variant, value) = match self {
671671
Value::Object(value) => {
672672
let mut iter = value.iter();
673-
let (variant, value) = match iter.next() {
674-
Some(v) => v,
675-
None => {
676-
return Err(crate::Deserializer::error(ErrorType::Eof));
677-
}
673+
let Some((variant, value)) = iter.next() else {
674+
return Err(crate::Deserializer::error(ErrorType::Eof));
678675
};
679676
// enums are encoded in json as maps with a single key:value pair
680677
if iter.next().is_some() {

‎src/stringparse.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,10 @@ pub(crate) fn get_unicode_codepoint(mut src_ptr: &[u8]) -> Result<(u32, usize),
7171
if ((code_point | code_point_2) >> 16) != 0 {
7272
return Ok((0, src_offset));
7373
}
74-
let c1 = if let Some(c) = code_point.checked_sub(0xd800) {
75-
c
76-
} else {
74+
let Some(c1) = code_point.checked_sub(0xd800) else {
7775
return Err(ErrorType::InvalidUtf8);
7876
};
79-
let c2 = if let Some(c) = code_point_2.checked_sub(0xdc00) {
80-
c
81-
} else {
77+
let Some(c2) = code_point_2.checked_sub(0xdc00) else {
8278
return Err(ErrorType::InvalidUtf8);
8379
};
8480
code_point = ((c1 << 10) | c2) + 0x10000;

‎src/value/borrowed/serialize.rs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ trait Generator: BaseGenerator {
6060
self.write(b"{")?;
6161

6262
// We know this exists since it's not empty
63-
let (key, value) = if let Some(v) = iter.next() {
64-
v
65-
} else {
63+
let Some((key, value)) = iter.next() else {
6664
// We check against size
6765
unreachable!();
6866
};
@@ -106,9 +104,7 @@ trait Generator: BaseGenerator {
106104
let mut iter = <[Value]>::iter(array);
107105
// We know we have one item
108106

109-
let item = if let Some(v) = iter.next() {
110-
v
111-
} else {
107+
let Some(item) = iter.next() else {
112108
// We check against size
113109
unreachable!();
114110
};
@@ -145,9 +141,7 @@ trait FastGenerator: BaseGenerator {
145141
self.write(b"{\"")?;
146142

147143
// We know this exists since it's not empty
148-
let (key, value) = if let Some(v) = iter.next() {
149-
v
150-
} else {
144+
let Some((key, value)) = iter.next() else {
151145
// We check against size
152146
unreachable!();
153147
};
@@ -185,9 +179,7 @@ trait FastGenerator: BaseGenerator {
185179
} else {
186180
let mut iter = <[Value]>::iter(array);
187181
// We know we have one item
188-
let item = if let Some(v) = iter.next() {
189-
v
190-
} else {
182+
let Some(item) = iter.next() else {
191183
// We check against size
192184
unreachable!();
193185
};

‎src/value/owned/serialize.rs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ trait Generator: BaseGenerator {
6060
self.write(b"{")?;
6161

6262
// We know this exists since it's not empty
63-
let (key, value) = if let Some(v) = iter.next() {
64-
v
65-
} else {
63+
let Some((key, value)) = iter.next() else {
6664
// We check against size
6765
unreachable!();
6866
};
@@ -106,9 +104,7 @@ trait Generator: BaseGenerator {
106104
let mut iter = <[Value]>::iter(array);
107105
// We know we have one item
108106

109-
let item = if let Some(v) = iter.next() {
110-
v
111-
} else {
107+
let Some(item) = iter.next() else {
112108
// We check against size
113109
unreachable!();
114110
};
@@ -147,9 +143,7 @@ trait FastGenerator: BaseGenerator {
147143
self.write(b"{\"")?;
148144

149145
// We know this exists since it's not empty
150-
let (key, value) = if let Some(v) = iter.next() {
151-
v
152-
} else {
146+
let Some((key, value)) = iter.next() else {
153147
// We check against size
154148
unreachable!();
155149
};
@@ -187,9 +181,7 @@ trait FastGenerator: BaseGenerator {
187181
} else {
188182
let mut iter = <[Value]>::iter(array);
189183
// We know we have one item
190-
let item = if let Some(v) = iter.next() {
191-
v
192-
} else {
184+
let Some(item) = iter.next() else {
193185
// We check against size
194186
unreachable!();
195187
};

‎src/value/tape/trait_impls.rs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -702,9 +702,7 @@ trait Generator: BaseGenerator {
702702
self.write(b"{")?;
703703

704704
// We know this exists since it's not empty
705-
let (key, value) = if let Some(v) = iter.next() {
706-
v
707-
} else {
705+
let Some((key, value)) = iter.next() else {
708706
// We check against size
709707
unreachable!();
710708
};
@@ -750,9 +748,7 @@ trait Generator: BaseGenerator {
750748
let mut iter = array.iter();
751749
// We know we have one item
752750

753-
let item = if let Some(v) = iter.next() {
754-
v
755-
} else {
751+
let Some(item) = iter.next() else {
756752
// We check against size
757753
unreachable!();
758754
};
@@ -789,9 +785,7 @@ trait FastGenerator: BaseGenerator {
789785
self.write(b"{\"")?;
790786

791787
// We know this exists since it's not empty
792-
let (key, value) = if let Some(v) = iter.next() {
793-
v
794-
} else {
788+
let Some((key, value)) = iter.next() else {
795789
// We check against size
796790
unreachable!();
797791
};
@@ -830,9 +824,7 @@ trait FastGenerator: BaseGenerator {
830824
let array = Array(&json.0[..=count]);
831825
let mut iter = array.iter();
832826
// We know we have one item
833-
let item = if let Some(v) = iter.next() {
834-
v
835-
} else {
827+
let Some(item) = iter.next() else {
836828
// We check against size
837829
unreachable!();
838830
};

0 commit comments

Comments
 (0)