Skip to content
This repository was archived by the owner on Aug 23, 2022. It is now read-only.

Commit 1d5bad0

Browse files
committed
fix clippy warnings
1 parent c408393 commit 1d5bad0

File tree

14 files changed

+24
-23
lines changed

14 files changed

+24
-23
lines changed

src/compound_packet/compound_packet_test.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fn test_valid_packet() {
151151
"goodbye",
152152
CompoundPacket(vec![
153153
Box::new(ReceiverReport::default()),
154-
Box::new(cname.clone()),
154+
Box::new(cname),
155155
Box::new(Goodbye::default()),
156156
]),
157157
None,
@@ -237,7 +237,7 @@ fn test_cname() {
237237
"goodbye",
238238
CompoundPacket(vec![
239239
Box::new(ReceiverReport::default()),
240-
Box::new(cname.clone()),
240+
Box::new(cname),
241241
Box::new(Goodbye::default()),
242242
]),
243243
None,
@@ -286,7 +286,7 @@ fn test_compound_packet_roundtrip() {
286286
"goodbye",
287287
CompoundPacket(vec![
288288
Box::new(ReceiverReport::default()),
289-
Box::new(cname.clone()),
289+
Box::new(cname),
290290
Box::new(Goodbye {
291291
sources: vec![1234],
292292
..Default::default()
@@ -320,11 +320,11 @@ fn test_compound_packet_roundtrip() {
320320

321321
let data1 = result.unwrap();
322322
let c = CompoundPacket::unmarshal(&mut data1.clone())
323-
.expect(format!("unmarshal {} error", name).as_str());
323+
.unwrap_or_else(|_| panic!("unmarshal {} error", name));
324324

325325
let data2 = c
326326
.marshal()
327-
.expect(format!("marshal {} error", name).as_str());
327+
.unwrap_or_else(|_| panic!("marshal {} error", name));
328328

329329
assert_eq!(
330330
data1, data2,

src/goodbye/goodbye_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ fn test_goodbye_round_trip() {
186186
(
187187
"count overflow",
188188
Goodbye {
189-
sources: too_many_sources.clone(),
189+
sources: too_many_sources,
190190
reason: Bytes::from_static(b""),
191191
},
192192
Some(Error::TooManySources),
@@ -223,7 +223,7 @@ fn test_goodbye_round_trip() {
223223
} else {
224224
let mut data = got.ok().unwrap();
225225
let actual =
226-
Goodbye::unmarshal(&mut data).expect(format!("Unmarshal {}", name).as_str());
226+
Goodbye::unmarshal(&mut data).unwrap_or_else(|_| panic!("Unmarshal {}", name));
227227

228228
assert_eq!(
229229
actual, want,

src/header.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ mod test {
313313
} else {
314314
let data = got.ok().unwrap();
315315
let buf = &mut data.clone();
316-
let actual = Header::unmarshal(buf).expect(format!("Unmarshal {}", name).as_str());
316+
let actual =
317+
Header::unmarshal(buf).unwrap_or_else(|_| panic!("Unmarshal {}", name));
317318

318319
assert_eq!(
319320
actual, want,

src/packet.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ where
5656

5757
match packets.len() {
5858
// Empty Packet
59-
0 => Err(Error::InvalidHeader.into()),
59+
0 => Err(Error::InvalidHeader),
6060

6161
// Single Packet
62-
1 => packets.pop().ok_or_else(|| Error::BadFirstPacket.into()),
62+
1 => packets.pop().ok_or(Error::BadFirstPacket),
6363

6464
// Compound Packet
6565
_ => Ok(Box::new(CompoundPacket(packets))),
@@ -76,7 +76,7 @@ where
7676

7777
let length = (h.length as usize) * 4;
7878
if length > raw_data.remaining() {
79-
return Err(Error::PacketTooShort.into());
79+
return Err(Error::PacketTooShort);
8080
}
8181

8282
let mut in_packet = h.marshal()?.chain(raw_data.take(length));

src/payload_feedbacks/full_intra_request/full_intra_request_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ fn test_full_intra_request_round_trip() {
172172
} else {
173173
let mut data = got.ok().unwrap();
174174
let actual = FullIntraRequest::unmarshal(&mut data)
175-
.expect(format!("Unmarshal {}", name).as_str());
175+
.unwrap_or_else(|_| panic!("Unmarshal {}", name));
176176

177177
assert_eq!(
178178
actual, want,

src/payload_feedbacks/picture_loss_indication/picture_loss_indication_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn test_picture_loss_indication_roundtrip() {
126126
} else {
127127
let mut data = got.ok().unwrap();
128128
let actual = PictureLossIndication::unmarshal(&mut data)
129-
.expect(format!("Unmarshal {}", name).as_str());
129+
.unwrap_or_else(|_| panic!("Unmarshal {}", name));
130130

131131
assert_eq!(
132132
actual, want,

src/payload_feedbacks/receiver_estimated_maximum_bitrate/receiver_estimated_maximum_bitrate_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ fn test_receiver_estimated_maximum_bitrate_roundtrip() {
158158

159159
let mut data = got.ok().unwrap();
160160
let actual = ReceiverEstimatedMaximumBitrate::unmarshal(&mut data)
161-
.expect(format!("Unmarshal {}", name).as_str());
161+
.unwrap_or_else(|_| panic!("Unmarshal {}", name));
162162

163163
if let Some(expected_bitrate) = unmarshal_expected {
164164
assert_eq!(

src/payload_feedbacks/slice_loss_indication/slice_loss_indication_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fn test_slice_loss_indication_roundtrip() {
132132
} else {
133133
let mut data = got.ok().unwrap();
134134
let actual = SliceLossIndication::unmarshal(&mut data)
135-
.expect(format!("Unmarshal {}", name).as_str());
135+
.unwrap_or_else(|_| panic!("Unmarshal {}", name));
136136

137137
assert_eq!(
138138
actual, want,

src/receiver_report/receiver_report_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ fn test_receiver_report_roundtrip() {
239239
);
240240
} else {
241241
let mut data = got.ok().unwrap();
242-
let actual =
243-
ReceiverReport::unmarshal(&mut data).expect(format!("Unmarshal {}", name).as_str());
242+
let actual = ReceiverReport::unmarshal(&mut data)
243+
.unwrap_or_else(|_| panic!("Unmarshal {}", name));
244244

245245
assert_eq!(
246246
actual, want,

src/sender_report/sender_report_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ fn test_sender_report_roundtrip() {
250250
} else {
251251
let mut data = got.ok().unwrap();
252252
let actual =
253-
SenderReport::unmarshal(&mut data).expect(format!("Unmarshal {}", name).as_str());
253+
SenderReport::unmarshal(&mut data).unwrap_or_else(|_| panic!("Unmarshal {}", name));
254254

255255
assert_eq!(
256256
actual, want,

0 commit comments

Comments
 (0)