Skip to content

Commit e23341d

Browse files
mmotornymmotorny
authored
Fix Clippy warnings for CI (#67)
- Replace manual modulo with is_multiple_of() in font dimensions - Replace map_or with is_some_and in app config save check - Replace map_or with is_ok_and in version update check - Add {source} to thiserror messages to fix unused_assignments - Remove unused FfmpegError enum Made-with: Cursor
1 parent b2aecde commit e23341d

File tree

6 files changed

+28
-37
lines changed

6 files changed

+28
-37
lines changed

‎backend/src/ffmpeg/error.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,9 @@ pub enum VideoInfoError {
1414
NoDuration,
1515
#[error("No stream in video file")]
1616
NoStream,
17-
#[error("Failed to probe video file")]
17+
#[error("Failed to probe video file: {source}")]
1818
FfprobeFailed {
1919
#[from]
2020
source: ffprobe::FfProbeError,
2121
},
2222
}
23-
24-
#[derive(Debug, Error)]
25-
pub enum FfmpegError {
26-
#[error("Failed to spawn FFMPEG process")]
27-
FailedToSpawnFfmpeg {
28-
#[from]
29-
source: std::io::Error,
30-
},
31-
}

‎backend/src/font/dimensions.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -80,51 +80,51 @@ impl FontType {
8080
}
8181

8282
pub fn detect_dimensions(width: u32, height: u32) -> Result<(CharacterSize, FontType, u32), FontFileError> {
83-
let (size, r#type) = if width == CHARACTER_WIDTH_SMALL && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
83+
let (size, r#type) = if width == CHARACTER_WIDTH_SMALL && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
8484
(CharacterSize::Small, FontType::Standard)
85-
} else if width == CHARACTER_WIDTH_LARGE && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
85+
} else if width == CHARACTER_WIDTH_LARGE && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
8686
(CharacterSize::Large, FontType::Standard)
87-
} else if width == CHARACTER_WIDTH_2K && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
87+
} else if width == CHARACTER_WIDTH_2K && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
8888
(CharacterSize::XLarge, FontType::Standard)
89-
} else if width == CHARACTER_WIDTH_4K && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
89+
} else if width == CHARACTER_WIDTH_4K && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
9090
(CharacterSize::Ultra, FontType::Standard)
91-
} else if width == CHARACTER_WIDTH_RACE && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
91+
} else if width == CHARACTER_WIDTH_RACE && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
9292
(CharacterSize::Race, FontType::Standard)
93-
} else if width == CHARACTER_WIDTH_SMALL * 2 && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
93+
} else if width == CHARACTER_WIDTH_SMALL * 2 && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
9494
(CharacterSize::Small, FontType::TwoPages)
95-
} else if width == CHARACTER_WIDTH_LARGE * 2 && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
95+
} else if width == CHARACTER_WIDTH_LARGE * 2 && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
9696
(CharacterSize::Large, FontType::TwoPages)
97-
} else if width == CHARACTER_WIDTH_2K * 2 && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
97+
} else if width == CHARACTER_WIDTH_2K * 2 && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
9898
(CharacterSize::XLarge, FontType::TwoPages)
99-
} else if width == CHARACTER_WIDTH_4K * 2 && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
99+
} else if width == CHARACTER_WIDTH_4K * 2 && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
100100
(CharacterSize::Ultra, FontType::TwoPages)
101-
} else if width == CHARACTER_WIDTH_RACE * 2 && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
101+
} else if width == CHARACTER_WIDTH_RACE * 2 && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
102102
(CharacterSize::Race, FontType::TwoPages)
103-
} else if width == CHARACTER_WIDTH_SMALL * 3 && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
103+
} else if width == CHARACTER_WIDTH_SMALL * 3 && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
104104
(CharacterSize::Small, FontType::ThreePages)
105-
} else if width == CHARACTER_WIDTH_LARGE * 3 && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
105+
} else if width == CHARACTER_WIDTH_LARGE * 3 && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
106106
(CharacterSize::Large, FontType::ThreePages)
107-
} else if width == CHARACTER_WIDTH_2K * 3 && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
107+
} else if width == CHARACTER_WIDTH_2K * 3 && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
108108
(CharacterSize::XLarge, FontType::ThreePages)
109-
} else if width == CHARACTER_WIDTH_4K * 3 && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
109+
} else if width == CHARACTER_WIDTH_4K * 3 && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
110110
(CharacterSize::Ultra, FontType::ThreePages)
111-
} else if width == CHARACTER_WIDTH_RACE * 3 && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
111+
} else if width == CHARACTER_WIDTH_RACE * 3 && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
112112
(CharacterSize::Race, FontType::ThreePages)
113-
} else if width == CHARACTER_WIDTH_SMALL * 4 && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
113+
} else if width == CHARACTER_WIDTH_SMALL * 4 && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
114114
(CharacterSize::Small, FontType::FourColor)
115-
} else if width == CHARACTER_WIDTH_LARGE * 4 && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
115+
} else if width == CHARACTER_WIDTH_LARGE * 4 && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
116116
(CharacterSize::Large, FontType::FourColor)
117-
} else if width == CHARACTER_WIDTH_2K * 4 && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
117+
} else if width == CHARACTER_WIDTH_2K * 4 && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
118118
(CharacterSize::XLarge, FontType::FourColor)
119-
} else if width == CHARACTER_WIDTH_4K * 4 && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
119+
} else if width == CHARACTER_WIDTH_4K * 4 && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
120120
(CharacterSize::Ultra, FontType::FourColor)
121-
} else if width == CHARACTER_WIDTH_RACE * 4 && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
121+
} else if width == CHARACTER_WIDTH_RACE * 4 && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
122122
(CharacterSize::Race, FontType::FourColor)
123123
} else {
124124
return Err(FontFileError::InvalidFontFileWidth { width });
125125
};
126126

127-
if height % size.height() != 0 {
127+
if !height.is_multiple_of(size.height()) {
128128
return Err(FontFileError::InvalidFontFileHeight { height });
129129
}
130130

‎backend/src/font/error.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use crate::util::Dimension;
44

55
#[derive(Error, Debug)]
66
pub enum FontFileError {
7-
#[error("Failed to open font file")]
7+
#[error("Failed to open font file: {source}")]
88
FailedToOpen {
99
#[from]
1010
source: std::io::Error,
1111
},
1212

13-
#[error("Failed to decode font file")]
13+
#[error("Failed to decode font file: {source}")]
1414
FailedToDecode {
1515
#[from]
1616
source: image::ImageError,

‎backend/src/osd/error.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ pub enum OsdFileError {
77

88
// #[error("Incomplete frame with index {index}")]
99
// IncompleteFrame { index: u32 },
10-
#[error("Malformed OSD file")]
10+
#[error("Malformed OSD file: {source}")]
1111
MalformedOsdFile {
1212
#[from]
1313
source: std::str::Utf8Error,
1414
},
1515

16-
#[error("Unable to open OSD file")]
16+
#[error("Unable to open OSD file: {source}")]
1717
UnableToOpenFile {
1818
#[from]
1919
source: std::io::Error,

‎ui/src/app.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ impl WalksnailOsdTool {
260260
fn save_config_if_changed(&mut self) {
261261
if self
262262
.config_changed
263-
.map_or(false, |t| t.elapsed() > Duration::from_millis(2000))
263+
.is_some_and(|t| t.elapsed() > Duration::from_millis(2000))
264264
{
265265
let config: AppConfig = self.into();
266266
config.save();

‎ui/src/util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ pub fn check_updates() -> Result<Option<GitHubReleaseItem>, LookupError> {
286286
.iter()
287287
.find(|release| {
288288
Version::parse(release.tag_name.trim_start_matches('v'))
289-
.map_or(false, |version| should_update_to_version(&current_version, &version))
289+
.is_ok_and(|version| should_update_to_version(&current_version, &version))
290290
})
291291
.cloned();
292292
Ok(update_target)

0 commit comments

Comments
 (0)