From 40b7016177eba920a4c2355079032097da50641f Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Sun, 28 Apr 2024 19:07:16 +0200 Subject: [PATCH] sys: Fix clippy lints, run cargo fmt --- ffmpeg-sys-the-third/build.rs | 13 ++++++------- ffmpeg-sys-the-third/src/avutil/rational.rs | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ffmpeg-sys-the-third/build.rs b/ffmpeg-sys-the-third/build.rs index f428ebb..e85f4b2 100644 --- a/ffmpeg-sys-the-third/build.rs +++ b/ffmpeg-sys-the-third/build.rs @@ -347,25 +347,24 @@ static POSTPROC_HEADERS: &[AVHeader] = &[AVHeader::new("postprocess.h")]; struct Callbacks; impl ParseCallbacks for Callbacks { - fn int_macro(&self, _name: &str, value: i64) -> Option { + fn int_macro(&self, name: &str, value: i64) -> Option { let ch_layout_prefix = "AV_CH_"; let codec_cap_prefix = "AV_CODEC_CAP_"; let codec_flag_prefix = "AV_CODEC_FLAG_"; let error_max_size = "AV_ERROR_MAX_STRING_SIZE"; - if _name.starts_with(ch_layout_prefix) { + if name.starts_with(ch_layout_prefix) { Some(IntKind::ULongLong) - } else if value >= i32::min_value() as i64 - && value <= i32::max_value() as i64 - && (_name.starts_with(codec_cap_prefix) || _name.starts_with(codec_flag_prefix)) + } else if (i32::MIN as i64..=i32::MAX as i64).contains(&value) + && (name.starts_with(codec_cap_prefix) || name.starts_with(codec_flag_prefix)) { Some(IntKind::UInt) - } else if _name == error_max_size { + } else if name == error_max_size { Some(IntKind::Custom { name: "usize", is_signed: false, }) - } else if value >= i32::min_value() as i64 && value <= i32::max_value() as i64 { + } else if (i32::MIN as i64..=i32::MAX as i64).contains(&value) { Some(IntKind::Int) } else { None diff --git a/ffmpeg-sys-the-third/src/avutil/rational.rs b/ffmpeg-sys-the-third/src/avutil/rational.rs index 73e7c83..2f9c2a0 100644 --- a/ffmpeg-sys-the-third/src/avutil/rational.rs +++ b/ffmpeg-sys-the-third/src/avutil/rational.rs @@ -17,7 +17,7 @@ pub unsafe fn av_cmp_q(a: AVRational, b: AVRational) -> c_int { } else if a.num != 0 && b.num != 0 { ((i64::from(a.num) >> 31) - (i64::from(b.num) >> 31)) as c_int } else { - c_int::min_value() + c_int::MIN } }