Skip to content

Commit c83aaef

Browse files
authored
Merge pull request #318 from mozilla/clippy-everything
Run clippy CI on all code, including tests
2 parents 9a5173c + 7a0ed76 commit c83aaef

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Clippy
4848
shell: bash
49-
run: rustup run ${{ matrix.rust }} cargo clippy --all -- -D warnings
49+
run: rustup run ${{ matrix.rust }} cargo clippy --all --bins --all-targets --examples --benches --tests -- -D warnings
5050

5151
- name: Test (release)
5252
shell: bash

mp4parse/src/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ fn read_vpcc_version_1() {
449449
Ok(vpcc) => {
450450
assert_eq!(vpcc.bit_depth, 8);
451451
assert_eq!(vpcc.chroma_subsampling, 3);
452-
assert_eq!(vpcc.video_full_range_flag, false);
452+
assert!(!vpcc.video_full_range_flag);
453453
assert_eq!(vpcc.matrix_coefficients.unwrap(), 1);
454454
}
455455
_ => panic!("vpcc parsing error"),

mp4parse/tests/public.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn public_api() {
105105

106106
// track.tkhd part
107107
let tkhd = track.tkhd.unwrap();
108-
assert_eq!(tkhd.disabled, false);
108+
assert!(!tkhd.disabled);
109109
assert_eq!(tkhd.duration, 40);
110110
assert_eq!(tkhd.width, 20_971_520);
111111
assert_eq!(tkhd.height, 15_728_640);
@@ -155,7 +155,7 @@ fn public_api() {
155155

156156
// track.tkhd part
157157
let tkhd = track.tkhd.unwrap();
158-
assert_eq!(tkhd.disabled, false);
158+
assert!(!tkhd.disabled);
159159
assert_eq!(tkhd.duration, 62);
160160
assert_eq!(tkhd.width, 0);
161161
assert_eq!(tkhd.height, 0);
@@ -242,9 +242,9 @@ fn public_metadata() {
242242
assert_eq!(meta.total_discs.unwrap(), 10);
243243
assert_eq!(meta.beats_per_minute.unwrap(), 128);
244244
assert_eq!(meta.composer.unwrap(), "Composer");
245-
assert_eq!(meta.compilation.unwrap(), true);
246-
assert_eq!(meta.gapless_playback.unwrap(), false);
247-
assert_eq!(meta.podcast.unwrap(), false);
245+
assert!(meta.compilation.unwrap());
246+
assert!(!meta.gapless_playback.unwrap());
247+
assert!(!meta.podcast.unwrap());
248248
assert_eq!(meta.advisory.unwrap(), mp4::AdvisoryRating::Clean);
249249
assert_eq!(meta.media_type.unwrap(), mp4::MediaType::Normal);
250250
assert_eq!(meta.rating.unwrap(), "50");
@@ -259,7 +259,7 @@ fn public_metadata() {
259259
assert_eq!(meta.tv_episode_number.unwrap(), 15);
260260
assert_eq!(meta.tv_season.unwrap(), 10);
261261
assert_eq!(meta.tv_show_name.unwrap(), "Show Name");
262-
assert_eq!(meta.hd_video.unwrap(), true);
262+
assert!(meta.hd_video.unwrap());
263263
assert_eq!(meta.owner.unwrap(), "Owner");
264264
assert_eq!(meta.sort_name.unwrap(), "Sort Name");
265265
assert_eq!(meta.sort_album.unwrap(), "Sort Album");
@@ -305,9 +305,9 @@ fn public_metadata_gnre() {
305305
assert_eq!(meta.total_discs.unwrap(), 10);
306306
assert_eq!(meta.beats_per_minute.unwrap(), 128);
307307
assert_eq!(meta.composer.unwrap(), "Composer");
308-
assert_eq!(meta.compilation.unwrap(), true);
309-
assert_eq!(meta.gapless_playback.unwrap(), false);
310-
assert_eq!(meta.podcast.unwrap(), false);
308+
assert!(meta.compilation.unwrap());
309+
assert!(!meta.gapless_playback.unwrap());
310+
assert!(!meta.podcast.unwrap());
311311
assert_eq!(meta.advisory.unwrap(), mp4::AdvisoryRating::Clean);
312312
assert_eq!(meta.media_type.unwrap(), mp4::MediaType::Normal);
313313
assert_eq!(meta.rating.unwrap(), "50");
@@ -322,7 +322,7 @@ fn public_metadata_gnre() {
322322
assert_eq!(meta.tv_episode_number.unwrap(), 15);
323323
assert_eq!(meta.tv_season.unwrap(), 10);
324324
assert_eq!(meta.tv_show_name.unwrap(), "Show Name");
325-
assert_eq!(meta.hd_video.unwrap(), true);
325+
assert!(meta.hd_video.unwrap());
326326
assert_eq!(meta.owner.unwrap(), "Owner");
327327
assert_eq!(meta.sort_name.unwrap(), "Sort Name");
328328
assert_eq!(meta.sort_album.unwrap(), "Sort Album");
@@ -362,15 +362,15 @@ fn public_invalid_metadata() {
362362
mp4::TrackType::Video => {
363363
// Check some of the values in the video tkhd.
364364
let tkhd = track.tkhd.unwrap();
365-
assert_eq!(tkhd.disabled, false);
365+
assert!(!tkhd.disabled);
366366
assert_eq!(tkhd.duration, 231232);
367367
assert_eq!(tkhd.width, 83_886_080);
368368
assert_eq!(tkhd.height, 47_185_920);
369369
}
370370
mp4::TrackType::Audio => {
371371
// Check some of the values in the audio tkhd.
372372
let tkhd = track.tkhd.unwrap();
373-
assert_eq!(tkhd.disabled, false);
373+
assert!(!tkhd.disabled);
374374
assert_eq!(tkhd.duration, 231338);
375375
assert_eq!(tkhd.width, 0);
376376
assert_eq!(tkhd.height, 0);
@@ -401,7 +401,7 @@ fn public_audio_tenc() {
401401
};
402402
assert_eq!(a.codec_type, mp4::CodecType::EncryptedAudio);
403403
match a.protection_info.iter().find(|sinf| sinf.tenc.is_some()) {
404-
Some(ref p) => {
404+
Some(p) => {
405405
assert_eq!(p.original_format, b"mp4a");
406406
if let Some(ref schm) = p.scheme_type {
407407
assert_eq!(schm.scheme_type, b"cenc");
@@ -459,7 +459,7 @@ fn public_video_cenc() {
459459
};
460460
assert_eq!(v.codec_type, mp4::CodecType::EncryptedVideo);
461461
match v.protection_info.iter().find(|sinf| sinf.tenc.is_some()) {
462-
Some(ref p) => {
462+
Some(p) => {
463463
assert_eq!(p.original_format, b"avc1");
464464
if let Some(ref schm) = p.scheme_type {
465465
assert_eq!(schm.scheme_type, b"cenc");
@@ -671,7 +671,7 @@ fn public_video_av1() {
671671

672672
// track.tkhd part
673673
let tkhd = track.tkhd.unwrap();
674-
assert_eq!(tkhd.disabled, false);
674+
assert!(!tkhd.disabled);
675675
assert_eq!(tkhd.duration, 42);
676676
assert_eq!(tkhd.width, 4_194_304);
677677
assert_eq!(tkhd.height, 4_194_304);
@@ -693,11 +693,11 @@ fn public_video_av1() {
693693
assert_eq!(av1c.level, 0);
694694
assert_eq!(av1c.tier, 0);
695695
assert_eq!(av1c.bit_depth, 8);
696-
assert_eq!(av1c.monochrome, false);
696+
assert!(!av1c.monochrome);
697697
assert_eq!(av1c.chroma_subsampling_x, 1);
698698
assert_eq!(av1c.chroma_subsampling_y, 1);
699699
assert_eq!(av1c.chroma_sample_position, 0);
700-
assert_eq!(av1c.initial_presentation_delay_present, false);
700+
assert!(!av1c.initial_presentation_delay_present);
701701
assert_eq!(av1c.initial_presentation_delay_minus_one, 0);
702702
}
703703
_ => panic!("Invalid test condition"),

0 commit comments

Comments
 (0)