diff --git a/audio/audiofx/src/audioecho/imp.rs b/audio/audiofx/src/audioecho/imp.rs index a3f9423c0..c369a4aba 100644 --- a/audio/audiofx/src/audioecho/imp.rs +++ b/audio/audiofx/src/audioecho/imp.rs @@ -11,8 +11,8 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst_audio::subclass::prelude::*; +use std::cmp; use std::sync::Mutex; -use std::{cmp, u64}; use byte_slice_cast::*; diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs index 5ba17ad5e..2703cf324 100644 --- a/audio/audiofx/src/audioloudnorm/imp.rs +++ b/audio/audiofx/src/audioloudnorm/imp.rs @@ -18,7 +18,6 @@ use gst::subclass::prelude::*; use std::mem; use std::sync::Mutex; -use std::u64; use byte_slice_cast::*; diff --git a/audio/audiofx/src/ebur128level/imp.rs b/audio/audiofx/src/ebur128level/imp.rs index bb39445b6..a2ec1b0ff 100644 --- a/audio/audiofx/src/ebur128level/imp.rs +++ b/audio/audiofx/src/ebur128level/imp.rs @@ -12,7 +12,6 @@ use gst::subclass::prelude::*; use gst_audio::subclass::prelude::*; use gst_base::prelude::*; -use std::i32; use std::sync::atomic; use std::sync::Mutex; diff --git a/audio/audiofx/tests/audioloudnorm.rs b/audio/audiofx/tests/audioloudnorm.rs index e36055c4d..4dc530143 100644 --- a/audio/audiofx/tests/audioloudnorm.rs +++ b/audio/audiofx/tests/audioloudnorm.rs @@ -198,7 +198,7 @@ fn basic_two_channels() { #[test] fn silence() { - run_test("wave=silence", None, 1000, 1024, 1, std::f64::NEG_INFINITY); + run_test("wave=silence", None, 1000, 1024, 1, f64::NEG_INFINITY); } #[test] @@ -228,7 +228,7 @@ fn below_threshold() { 1000, 1024, 1, - std::f64::NEG_INFINITY, + f64::NEG_INFINITY, ); } diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs index ed2a34269..0121f27c5 100644 --- a/audio/csound/src/filter/imp.rs +++ b/audio/csound/src/filter/imp.rs @@ -17,7 +17,6 @@ use gst_base::subclass::prelude::*; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Mutex; -use std::{f64, i32}; use byte_slice_cast::*; diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs index 794e0d5aa..1ae812831 100644 --- a/generic/sodium/src/decrypter/imp.rs +++ b/generic/sodium/src/decrypter/imp.rs @@ -500,7 +500,7 @@ impl Decrypter { gst::debug!(CAT, obj: pad, "Stream Block index: {}", chunk_index); let pull_offset = offset - (chunk_index * block_size as u64); - assert!(pull_offset <= std::u32::MAX as u64); + assert!(pull_offset <= u32::MAX as u64); let pull_offset = pull_offset as u32; let pulled_buffer = diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs index 10e5c9637..a239e6a8d 100644 --- a/generic/threadshare/src/appsrc/imp.rs +++ b/generic/threadshare/src/appsrc/imp.rs @@ -30,7 +30,6 @@ use once_cell::sync::Lazy; use std::sync::Mutex; use std::time::Duration; -use std::u32; use crate::runtime::prelude::*; use crate::runtime::{Context, PadSrc, Task, TaskState}; diff --git a/generic/threadshare/src/dataqueue.rs b/generic/threadshare/src/dataqueue.rs index 092cb3814..289d2b8e7 100644 --- a/generic/threadshare/src/dataqueue.rs +++ b/generic/threadshare/src/dataqueue.rs @@ -26,7 +26,6 @@ use once_cell::sync::Lazy; use std::collections::VecDeque; use std::sync::Arc; use std::sync::Mutex as StdMutex; -use std::u32; static DATA_QUEUE_CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs index 006feb74f..8c78e54e0 100644 --- a/generic/threadshare/src/inputselector/imp.rs +++ b/generic/threadshare/src/inputselector/imp.rs @@ -30,7 +30,6 @@ use once_cell::sync::Lazy; use std::collections::HashMap; use std::sync::{Arc, Mutex}; use std::time::Duration; -use std::u32; use crate::runtime::prelude::*; use crate::runtime::{self, PadSink, PadSrc}; diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs index 73528398b..a02df801d 100644 --- a/generic/threadshare/src/jitterbuffer/imp.rs +++ b/generic/threadshare/src/jitterbuffer/imp.rs @@ -266,7 +266,7 @@ impl SinkHandler { inner.gap_packets.insert(GapPacket::new(buffer)); if gap_packets_length > 0 { - let mut prev_gap_seq = std::u32::MAX; + let mut prev_gap_seq = u32::MAX; let mut all_consecutive = true; for gap_packet in inner.gap_packets.iter() { @@ -279,7 +279,7 @@ impl SinkHandler { all_consecutive = gap_packet.pt == pt; - if prev_gap_seq == std::u32::MAX { + if prev_gap_seq == u32::MAX { prev_gap_seq = gap_packet.seq as u32; } else if gst_rtp::compare_seqnum(gap_packet.seq, prev_gap_seq as u16) != -1 { all_consecutive = false; diff --git a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs index 07068c6f7..5b08b803e 100644 --- a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs +++ b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs @@ -91,7 +91,7 @@ impl RTPJitterBufferItem { r#type: 0, dts: dts.into().into_glib(), pts: pts.into().into_glib(), - seqnum: seqnum.map(|s| s as u32).unwrap_or(std::u32::MAX), + seqnum: seqnum.map(|s| s as u32).unwrap_or(u32::MAX), count: 1, rtptime, }, @@ -138,7 +138,7 @@ impl RTPJitterBufferItem { pub fn seqnum(&self) -> Option { unsafe { let item = self.0.as_ref().expect("Invalid wrapper"); - if item.as_ref().seqnum == std::u32::MAX { + if item.as_ref().seqnum == u32::MAX { None } else { Some(item.as_ref().seqnum as u16) @@ -306,7 +306,7 @@ impl RTPJitterBuffer { let pts = from_glib(pts.assume_init()); let seqnum = seqnum.assume_init(); - let seqnum = if seqnum == std::u32::MAX { + let seqnum = if seqnum == u32::MAX { None } else { Some(seqnum as u16) @@ -339,7 +339,7 @@ impl RTPJitterBuffer { (None, None) } else { let seqnum = (*item).seqnum; - let seqnum = if seqnum == std::u32::MAX { + let seqnum = if seqnum == u32::MAX { None } else { Some(seqnum as u16) diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs index 505374147..c23539075 100644 --- a/generic/threadshare/src/proxy/imp.rs +++ b/generic/threadshare/src/proxy/imp.rs @@ -31,7 +31,6 @@ use std::collections::{HashMap, VecDeque}; use std::sync::{Arc, Weak}; use std::sync::{Mutex, MutexGuard}; use std::time::Duration; -use std::{u32, u64}; use crate::runtime::prelude::*; use crate::runtime::{Context, PadSink, PadSinkWeak, PadSrc, PadSrcWeak, Task}; diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs index cc528763c..f44f0d749 100644 --- a/generic/threadshare/src/queue/imp.rs +++ b/generic/threadshare/src/queue/imp.rs @@ -30,7 +30,6 @@ use once_cell::sync::Lazy; use std::collections::VecDeque; use std::sync::Mutex; use std::time::Duration; -use std::{u32, u64}; use crate::runtime::prelude::*; use crate::runtime::{Context, PadSink, PadSrc, Task}; diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs index ee6c18d63..54774ccd6 100644 --- a/generic/threadshare/src/tcpclientsrc/imp.rs +++ b/generic/threadshare/src/tcpclientsrc/imp.rs @@ -31,8 +31,6 @@ use std::io; use std::net::{IpAddr, SocketAddr, TcpStream}; use std::sync::Mutex; use std::time::Duration; -use std::u16; -use std::u32; use crate::runtime::prelude::*; use crate::runtime::task; diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs index 252030862..6c0ab11a9 100644 --- a/generic/threadshare/src/udpsink/imp.rs +++ b/generic/threadshare/src/udpsink/imp.rs @@ -37,8 +37,6 @@ use std::collections::BTreeSet; use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}; use std::sync::{Arc, Mutex}; use std::time::Duration; -use std::u16; -use std::u8; const DEFAULT_HOST: Option<&str> = Some("127.0.0.1"); const DEFAULT_PORT: i32 = 5004; diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs index 0e2ca9dea..24e6e9bee 100644 --- a/generic/threadshare/src/udpsrc/imp.rs +++ b/generic/threadshare/src/udpsrc/imp.rs @@ -27,12 +27,10 @@ use gst_net::*; use once_cell::sync::Lazy; -use std::i32; use std::io; use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket}; use std::sync::Mutex; use std::time::Duration; -use std::u16; use crate::runtime::prelude::*; use crate::runtime::{Async, Context, PadSrc, Task}; diff --git a/net/hlssink3/examples/cmaf_live.rs b/net/hlssink3/examples/cmaf_live.rs index 4c7735ccd..264ce6abd 100644 --- a/net/hlssink3/examples/cmaf_live.rs +++ b/net/hlssink3/examples/cmaf_live.rs @@ -107,7 +107,7 @@ fn setup_video_sink(pipeline: &gst::Pipeline, path: &Path, name: &str) -> Result let enc = gst::ElementFactory::make("x264enc") .property("bframes", 0u32) .property("bitrate", VIDEO_BITRATE / 1000u32) - .property("key-int-max", std::i32::MAX as u32) + .property("key-int-max", i32::MAX as u32) .property_from_str("tune", "zerolatency") .build()?; let h264_capsfilter = gst::ElementFactory::make("capsfilter") diff --git a/net/ndi/src/ndisink/imp.rs b/net/ndi/src/ndisink/imp.rs index c14c66e3f..fb2214576 100644 --- a/net/ndi/src/ndisink/imp.rs +++ b/net/ndi/src/ndisink/imp.rs @@ -135,13 +135,13 @@ impl ElementImpl for NdiSink { gst_video::VideoFormat::Rgbx.to_str(), ]), ) - .field("width", gst::IntRange::::new(1, std::i32::MAX)) - .field("height", gst::IntRange::::new(1, std::i32::MAX)) + .field("width", gst::IntRange::::new(1, i32::MAX)) + .field("height", gst::IntRange::::new(1, i32::MAX)) .field( "framerate", gst::FractionRange::new( gst::Fraction::new(0, 1), - gst::Fraction::new(std::i32::MAX, 1), + gst::Fraction::new(i32::MAX, 1), ), ) .build(), diff --git a/net/ndi/src/ndisrc/imp.rs b/net/ndi/src/ndisrc/imp.rs index 4f9dad465..727ab764d 100644 --- a/net/ndi/src/ndisrc/imp.rs +++ b/net/ndi/src/ndisrc/imp.rs @@ -7,7 +7,6 @@ use gst_base::subclass::base_src::CreateSuccess; use gst_base::subclass::prelude::*; use std::sync::Mutex; -use std::u32; use once_cell::sync::Lazy; diff --git a/net/ndi/src/ndisrcmeta.rs b/net/ndi/src/ndisrcmeta.rs index 14727c2e4..0b712d4d7 100644 --- a/net/ndi/src/ndisrcmeta.rs +++ b/net/ndi/src/ndisrcmeta.rs @@ -27,7 +27,9 @@ pub enum Buffer { }, Metadata { frame: MetadataFrame, + #[allow(unused)] receive_time_gst: gst::ClockTime, + #[allow(unused)] receive_time_real: gst::ClockTime, }, } diff --git a/net/ndi/src/ndisys.rs b/net/ndi/src/ndisys.rs index e732e3441..6336081d7 100644 --- a/net/ndi/src/ndisys.rs +++ b/net/ndi/src/ndisys.rs @@ -226,8 +226,8 @@ pub enum NDIlib_frame_format_type_e { NDIlib_frame_format_type_field_1 = 3, } -pub const NDIlib_send_timecode_synthesize: i64 = ::std::i64::MAX; -pub const NDIlib_recv_timestamp_undefined: i64 = ::std::i64::MAX; +pub const NDIlib_send_timecode_synthesize: i64 = i64::MAX; +pub const NDIlib_recv_timestamp_undefined: i64 = i64::MAX; #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/net/raptorq/src/raptorqenc/imp.rs b/net/raptorq/src/raptorqenc/imp.rs index cb37a0a2a..50c5b2693 100644 --- a/net/raptorq/src/raptorqenc/imp.rs +++ b/net/raptorq/src/raptorqenc/imp.rs @@ -872,7 +872,7 @@ impl ElementImpl for RaptorqEnc { fn pad_templates() -> &'static [gst::PadTemplate] { static PAD_TEMPLATES: Lazy> = Lazy::new(|| { let caps = gst::Caps::builder("application/x-rtp") - .field("clock-rate", gst::IntRange::new(0, std::i32::MAX)) + .field("clock-rate", gst::IntRange::new(0, i32::MAX)) .build(); let srcpad_template = gst::PadTemplate::new( diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index 98d94e91e..77b5439f7 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -9,7 +9,6 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use std::sync::{Arc, Mutex}; use std::time::Duration; -use std::u64; use futures::future; use futures::prelude::*; @@ -539,6 +538,8 @@ impl ReqwestHttpSrc { .unwrap_or(false); let seekable = size.is_some() && accept_byte_ranges; + #[allow(clippy::manual_unwrap_or_default)] + // https://github.com/rust-lang/rust-clippy/issues/12928 let position = if let Some((range_start, _)) = headers .typed_get::() .and_then(|range| range.bytes_range()) diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs index 8e70e9ef5..0ff2d8eff 100644 --- a/tutorial/src/sinesrc/imp.rs +++ b/tutorial/src/sinesrc/imp.rs @@ -19,7 +19,6 @@ use byte_slice_cast::*; use std::ops::Rem; use std::sync::Mutex; -use std::u32; use num_traits::cast::NumCast; use num_traits::float::Float; diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index 0d906a31d..a5d8e8fb9 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs @@ -262,21 +262,21 @@ impl ObjectImpl for FallbackSrc { glib::ParamSpecUInt64::builder("timeout") .nick("Timeout") .blurb("Timeout for switching to the fallback URI") - .maximum(std::u64::MAX - 1) + .maximum(u64::MAX - 1) .default_value(5 * *gst::ClockTime::SECOND) .mutable_ready() .build(), glib::ParamSpecUInt64::builder("restart-timeout") .nick("Timeout") .blurb("Timeout for restarting an active source") - .maximum(std::u64::MAX - 1) + .maximum(u64::MAX - 1) .default_value(5 * *gst::ClockTime::SECOND) .mutable_ready() .build(), glib::ParamSpecUInt64::builder("retry-timeout") .nick("Retry Timeout") .blurb("Timeout for stopping after repeated failure") - .maximum(std::u64::MAX - 1) + .maximum(u64::MAX - 1) .default_value(60 * *gst::ClockTime::SECOND) .mutable_ready() .build(), @@ -296,14 +296,14 @@ impl ObjectImpl for FallbackSrc { .blurb("When the main source has a higher latency than the fallback source \ this allows to configure a minimum latency that would be configured \ if initially the fallback is enabled") - .maximum(std::u64::MAX - 1) + .maximum(u64::MAX - 1) .mutable_ready() .build(), glib::ParamSpecInt64::builder("buffer-duration") .nick("Buffer Duration") .blurb("Buffer duration when buffering streams (-1 default value)") .minimum(-1) - .maximum(std::i64::MAX - 1) + .maximum(i64::MAX - 1) .default_value(-1) .mutable_ready() .build(), diff --git a/utils/fallbackswitch/src/fallbackswitch/imp.rs b/utils/fallbackswitch/src/fallbackswitch/imp.rs index 5167b545a..25a8d570e 100644 --- a/utils/fallbackswitch/src/fallbackswitch/imp.rs +++ b/utils/fallbackswitch/src/fallbackswitch/imp.rs @@ -1329,21 +1329,21 @@ impl ObjectImpl for FallbackSwitch { glib::ParamSpecUInt64::builder(PROP_TIMEOUT) .nick("Input timeout") .blurb("Timeout on an input before switching to a lower priority input.") - .maximum(std::u64::MAX - 1) + .maximum(u64::MAX - 1) .default_value(Settings::default().timeout.nseconds()) .mutable_playing() .build(), glib::ParamSpecUInt64::builder(PROP_LATENCY) .nick("Latency") .blurb("Additional latency in live mode to allow upstream to take longer to produce buffers for the current position (in nanoseconds)") - .maximum(std::u64::MAX - 1) + .maximum(u64::MAX - 1) .default_value(Settings::default().latency.nseconds()) .mutable_ready() .build(), glib::ParamSpecUInt64::builder(PROP_MIN_UPSTREAM_LATENCY) .nick("Minimum Upstream Latency") .blurb("When sources with a higher latency are expected to be plugged in dynamically after the fallbackswitch has started playing, this allows overriding the minimum latency reported by the initial source(s). This is only taken into account when larger than the actually reported minimum latency. (nanoseconds)") - .maximum(std::u64::MAX - 1) + .maximum(u64::MAX - 1) .default_value(Settings::default().min_upstream_latency.nseconds()) .mutable_ready() .build(), diff --git a/utils/togglerecord/src/togglerecord/imp.rs b/utils/togglerecord/src/togglerecord/imp.rs index 0be6b3355..54f19f70c 100644 --- a/utils/togglerecord/src/togglerecord/imp.rs +++ b/utils/togglerecord/src/togglerecord/imp.rs @@ -20,7 +20,6 @@ use once_cell::sync::Lazy; use parking_lot::{Condvar, Mutex, MutexGuard}; use std::cmp; use std::collections::HashMap; -use std::f64; use std::iter; use std::sync::Arc; diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs index 39ea519f9..f291eab24 100644 --- a/video/closedcaption/src/ccdetect/imp.rs +++ b/video/closedcaption/src/ccdetect/imp.rs @@ -15,7 +15,6 @@ use crate::ccutils::{extract_cdp, ParseError, ParseErrorCode}; use once_cell::sync::Lazy; use std::sync::Mutex; -use std::u64; static CAT: Lazy = Lazy::new(|| { gst::DebugCategory::new( diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs index deb833b19..90a48180d 100644 --- a/video/closedcaption/src/mcc_parse/imp.rs +++ b/video/closedcaption/src/mcc_parse/imp.rs @@ -1144,8 +1144,8 @@ impl ElementImpl for MccParse { { let caps = caps.get_mut().unwrap(); let framerate = gst::FractionRange::new( - gst::Fraction::new(1, std::i32::MAX), - gst::Fraction::new(std::i32::MAX, 1), + gst::Fraction::new(1, i32::MAX), + gst::Fraction::new(i32::MAX, 1), ); let s = gst::Structure::builder("closedcaption/x-cea-708") diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs index f5c1853a7..93d41fefc 100644 --- a/video/closedcaption/src/tttocea608/imp.rs +++ b/video/closedcaption/src/tttocea608/imp.rs @@ -1144,8 +1144,8 @@ impl ElementImpl for TtToCea608 { .unwrap(); let framerate = gst::FractionRange::new( - gst::Fraction::new(1, std::i32::MAX), - gst::Fraction::new(std::i32::MAX, 1), + gst::Fraction::new(1, i32::MAX), + gst::Fraction::new(i32::MAX, 1), ); let caps = gst::Caps::builder("closedcaption/x-cea-608") diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs index b65e5a5b6..49b0e5c76 100644 --- a/video/dav1d/src/dav1ddec/imp.rs +++ b/video/dav1d/src/dav1ddec/imp.rs @@ -16,7 +16,6 @@ use gst_video::subclass::prelude::*; use once_cell::sync::Lazy; -use std::i32; use std::sync::{Mutex, MutexGuard}; const DEFAULT_N_THREADS: u32 = 0; @@ -513,7 +512,7 @@ impl ObjectImpl for Dav1dDec { .nick("Maximum frame delay") .blurb("Maximum delay in frames for the decoder (set to 1 for low latency, 0 to be equal to the number of logical cores. -1 to choose between these two based on pipeline liveness)") .minimum(-1) - .maximum(std::u32::MAX.into()) + .maximum(u32::MAX.into()) .default_value(DEFAULT_MAX_FRAME_DELAY) .mutable_ready() .build(), diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs index c813a809d..e92451c3f 100644 --- a/video/gif/src/gifenc/imp.rs +++ b/video/gif/src/gifenc/imp.rs @@ -150,7 +150,7 @@ impl ObjectImpl for GifEnc { .nick("Repeat") .blurb("Repeat (-1 to loop forever, 0 .. n finite repetitions)") .minimum(-1) - .maximum(std::u16::MAX as i32) + .maximum(u16::MAX as i32) .default_value(DEFAULT_REPEAT) .mutable_ready() .build(), diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs index 14f7148bf..403b9fc84 100644 --- a/video/rav1e/src/rav1enc/imp.rs +++ b/video/rav1e/src/rav1enc/imp.rs @@ -292,7 +292,7 @@ impl ObjectImpl for Rav1Enc { glib::ParamSpecUInt::builder("min-quantizer") .nick("Min Quantizer") .blurb("Min Quantizer") - .maximum(std::u8::MAX as u32) + .maximum(u8::MAX as u32) .default_value(DEFAULT_MIN_QUANTIZER as u32) .mutable_ready() .build(),