From 136e42c6bb095789abd8e3ed7adb61aa3db6aede Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Thu, 9 Oct 2025 18:05:15 +0200 Subject: [PATCH] add implicit lifetimes markers where appropriate Default Rust 1.69 does not care but newer versions start to give warnings. --- nihav-core/src/codecs/mod.rs | 8 ++++---- nihav-core/src/demuxers/mod.rs | 10 +++++----- nihav-core/src/muxers/mod.rs | 4 ++-- nihav-duck/src/codecs/vp7enc/blocks.rs | 4 ++-- nihav-itu/src/codecs/h264/pic_ref.rs | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nihav-core/src/codecs/mod.rs b/nihav-core/src/codecs/mod.rs index e009b31..5a2b945 100644 --- a/nihav-core/src/codecs/mod.rs +++ b/nihav-core/src/codecs/mod.rs @@ -129,7 +129,7 @@ impl RegisteredDecoders { None } /// Provides an iterator over currently registered decoders. - pub fn iter(&self) -> std::slice::Iter { + pub fn iter(&self) -> std::slice::Iter<'_, DecoderInfo> { self.decs.iter() } } @@ -197,7 +197,7 @@ impl RegisteredMTDecoders { None } /// Provides an iterator over currently registered decoders. - pub fn iter(&self) -> std::slice::Iter { + pub fn iter(&self) -> std::slice::Iter<'_, MTDecoderInfo> { self.decs.iter() } } @@ -424,7 +424,7 @@ impl RegisteredEncoders { None } /// Provides an iterator over currently registered encoders. - pub fn iter(&self) -> std::slice::Iter { + pub fn iter(&self) -> std::slice::Iter<'_, EncoderInfo> { self.encs.iter() } } @@ -498,7 +498,7 @@ impl RegisteredPacketisers { None } /// Provides an iterator over currently registered packetiser. - pub fn iter(&self) -> std::slice::Iter { + pub fn iter(&self) -> std::slice::Iter<'_, PacketiserInfo> { self.packs.iter() } } diff --git a/nihav-core/src/demuxers/mod.rs b/nihav-core/src/demuxers/mod.rs index 9402c98..78f4ab5 100644 --- a/nihav-core/src/demuxers/mod.rs +++ b/nihav-core/src/demuxers/mod.rs @@ -85,7 +85,7 @@ impl StreamManager { } } /// Returns stream iterator. - pub fn iter(&self) -> StreamIter { StreamIter::new(&self.streams) } + pub fn iter(&self) -> StreamIter<'_> { StreamIter::new(&self.streams) } /// Adds a new stream. pub fn add_stream(&mut self, stream: NAStream) -> Option { @@ -370,7 +370,7 @@ impl<'a> Demuxer<'a> { &self.streams } /// Returns an iterator over streams. - pub fn get_streams(&self) -> StreamIter { + pub fn get_streams(&self) -> StreamIter<'_> { self.streams.iter() } /// Returns 'ignored' marker for requested stream. @@ -493,7 +493,7 @@ impl RegisteredDemuxers { self.dmxs.iter().find(|&&dmx| dmx.get_name() == name).copied() } /// Provides an iterator over currently registered demuxers. - pub fn iter(&self) -> std::slice::Iter<&dyn DemuxerCreator> { + pub fn iter(&self) -> std::slice::Iter<'_, &dyn DemuxerCreator> { self.dmxs.iter() } } @@ -543,7 +543,7 @@ impl<'a> RawDemuxer<'a> { &self.streams } /// Returns an iterator over streams. - pub fn get_streams(&self) -> StreamIter { + pub fn get_streams(&self) -> StreamIter<'_> { self.streams.iter() } /// Returns 'ignored' marker for requested stream. @@ -664,7 +664,7 @@ impl RegisteredRawDemuxers { self.dmxs.iter().find(|&&dmx| dmx.get_name() == name).copied() } /// Provides an iterator over currently registered demuxers. - pub fn iter(&self) -> std::slice::Iter<&dyn RawDemuxerCreator> { + pub fn iter(&self) -> std::slice::Iter<'_, &dyn RawDemuxerCreator> { self.dmxs.iter() } } diff --git a/nihav-core/src/muxers/mod.rs b/nihav-core/src/muxers/mod.rs index 6ea01d8..1364574 100644 --- a/nihav-core/src/muxers/mod.rs +++ b/nihav-core/src/muxers/mod.rs @@ -132,7 +132,7 @@ impl<'a> Muxer<'a> { self.streams.get_num_streams() } /// Returns an iterator over streams. - pub fn get_streams(&self) -> StreamIter { + pub fn get_streams(&self) -> StreamIter<'_> { self.streams.iter() } @@ -201,7 +201,7 @@ impl RegisteredMuxers { self.muxes.iter().find(|&&mux| mux.get_name() == name).copied() } /// Provides an iterator over currently registered muxers. - pub fn iter(&self) -> std::slice::Iter<&dyn MuxerCreator> { + pub fn iter(&self) -> std::slice::Iter<'_, &dyn MuxerCreator> { self.muxes.iter() } } diff --git a/nihav-duck/src/codecs/vp7enc/blocks.rs b/nihav-duck/src/codecs/vp7enc/blocks.rs index 1cf4939..994e078 100644 --- a/nihav-duck/src/codecs/vp7enc/blocks.rs +++ b/nihav-duck/src/codecs/vp7enc/blocks.rs @@ -287,10 +287,10 @@ impl SrcBlock { self.chroma[1].ipred8(8, mode, ipred_v); } - pub fn luma_blocks(&self) -> LumaIterator { + pub fn luma_blocks(&self) -> LumaIterator<'_> { LumaIterator{ luma: &self.luma, blkno: 0 } } - pub fn chroma_blocks(&self, plane: usize) -> ChromaIterator { + pub fn chroma_blocks(&self, plane: usize) -> ChromaIterator<'_> { ChromaIterator{ chroma: &self.chroma[plane], blkno: 0 } } } diff --git a/nihav-itu/src/codecs/h264/pic_ref.rs b/nihav-itu/src/codecs/h264/pic_ref.rs index b027d06..852f9d0 100644 --- a/nihav-itu/src/codecs/h264/pic_ref.rs +++ b/nihav-itu/src/codecs/h264/pic_ref.rs @@ -199,7 +199,7 @@ impl<'a> SimplifiedSliceRefs<'a> { None } } - pub fn select_ref_pic(&self, list_id: u8, ref_id: usize) -> Option<&SimpleFrame> { + pub fn select_ref_pic(&self, list_id: u8, ref_id: usize) -> Option<&SimpleFrame<'_>> { let ref_list = if list_id == 0 { &self.ref_list0 } else { &self.ref_list1 }; if ref_list.len() > ref_id { ref_list[ref_id].as_ref().map(|pic| &pic.buf) -- 2.39.5