Clippy wants us to elide lifetimes (#780)

Fixed with cargo clippy --fix

- [x] no changelog update needed
This commit is contained in:
Gwilym Inzani 2024-10-05 22:24:01 +01:00 committed by GitHub
commit ebfe851287
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 24 additions and 24 deletions

View file

@ -46,7 +46,7 @@ impl<'a> GwilymDecodeIter<'a> {
} }
} }
impl<'a> Iterator for GwilymDecodeIter<'a> { impl Iterator for GwilymDecodeIter<'_> {
type Item = u32; type Item = u32;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {

View file

@ -387,7 +387,7 @@ impl<'a, K, ALLOCATOR: ClonableAllocator> Iterator for Iter<'a, K, ALLOCATOR> {
} }
} }
impl<'a, K, ALLOCATOR: ClonableAllocator> ExactSizeIterator for Iter<'a, K, ALLOCATOR> {} impl<K, ALLOCATOR: ClonableAllocator> ExactSizeIterator for Iter<'_, K, ALLOCATOR> {}
impl<K> FromIterator<K> for HashSet<K> impl<K> FromIterator<K> for HashSet<K>
where where

View file

@ -528,7 +528,7 @@ impl<'a, K, V, ALLOCATOR: ClonableAllocator> Iterator for Iter<'a, K, V, ALLOCAT
} }
} }
impl<'a, K, V, ALLOCATOR: ClonableAllocator> ExactSizeIterator for Iter<'a, K, V, ALLOCATOR> {} impl<K, V, ALLOCATOR: ClonableAllocator> ExactSizeIterator for Iter<'_, K, V, ALLOCATOR> {}
impl<'a, K, V, ALLOCATOR: ClonableAllocator> IntoIterator for &'a HashMap<K, V, ALLOCATOR> { impl<'a, K, V, ALLOCATOR: ClonableAllocator> IntoIterator for &'a HashMap<K, V, ALLOCATOR> {
type Item = (&'a K, &'a V); type Item = (&'a K, &'a V);

View file

@ -60,7 +60,7 @@ pub struct BlendLayer<'blend, 'gba> {
layer: Layer, layer: Layer,
} }
impl<'gba> BlendLayer<'_, 'gba> { impl BlendLayer<'_, '_> {
/// Set whether a background is enabled for blending on this layer. /// Set whether a background is enabled for blending on this layer.
pub fn set_background_enable(&mut self, background: BackgroundID, enable: bool) -> &mut Self { pub fn set_background_enable(&mut self, background: BackgroundID, enable: bool) -> &mut Self {
self.blend self.blend

View file

@ -135,7 +135,7 @@ pub struct TextWriter<'a, 'b> {
bg: &'a mut RegularMap, bg: &'a mut RegularMap,
} }
impl<'a, 'b> Write for TextWriter<'a, 'b> { impl Write for TextWriter<'_, '_> {
fn write_str(&mut self, text: &str) -> Result<(), Error> { fn write_str(&mut self, text: &str) -> Result<(), Error> {
for c in text.chars() { for c in text.chars() {
self.text_renderer.write_char( self.text_renderer.write_char(
@ -150,7 +150,7 @@ impl<'a, 'b> Write for TextWriter<'a, 'b> {
} }
} }
impl<'a, 'b> TextWriter<'a, 'b> { impl TextWriter<'_, '_> {
pub fn commit(self) { pub fn commit(self) {
self.text_renderer.commit(self.bg, self.vram_manager); self.text_renderer.commit(self.bg, self.vram_manager);
} }

View file

@ -134,7 +134,7 @@ impl Line {
} }
} }
impl<'pre> Iterator for Lines<'pre> { impl Iterator for Lines<'_> {
type Item = Line; type Item = Line;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {

View file

@ -70,7 +70,7 @@ pub struct OamIterator<'oam> {
frame_data: &'oam UnsafeCell<OamFrameModifyables>, frame_data: &'oam UnsafeCell<OamFrameModifyables>,
} }
impl<'oam> OamIterator<'oam> { impl OamIterator<'_> {
/// Sets the next oam slot with the provided `object`. /// Sets the next oam slot with the provided `object`.
/// ///
/// Is equivalent to the following: /// Is equivalent to the following:

View file

@ -487,7 +487,7 @@ pub struct MapLoan<'a, T> {
screenblock_list: &'a RefCell<Bitarray<1>>, screenblock_list: &'a RefCell<Bitarray<1>>,
} }
impl<'a, T> Deref for MapLoan<'a, T> { impl<T> Deref for MapLoan<'_, T> {
type Target = T; type Target = T;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
@ -495,7 +495,7 @@ impl<'a, T> Deref for MapLoan<'a, T> {
} }
} }
impl<'a, T> DerefMut for MapLoan<'a, T> { impl<T> DerefMut for MapLoan<'_, T> {
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.map &mut self.map
} }
@ -526,7 +526,7 @@ impl<'a, T> MapLoan<'a, T> {
} }
} }
impl<'a, T> Drop for MapLoan<'a, T> { impl<T> Drop for MapLoan<'_, T> {
fn drop(&mut self) { fn drop(&mut self) {
self.map_list self.map_list
.borrow_mut() .borrow_mut()

View file

@ -31,7 +31,7 @@ pub enum WinIn {
Win1, Win1,
} }
impl<'gba> Windows<'gba> { impl Windows<'_> {
pub(crate) fn new() -> Self { pub(crate) fn new() -> Self {
let s = Self { let s = Self {
wins: [MovableWindow::new(0), MovableWindow::new(1)], wins: [MovableWindow::new(0), MovableWindow::new(1)],

View file

@ -24,7 +24,7 @@ pub struct Dmas<'gba> {
pub dma3: Dma, pub dma3: Dma,
} }
impl<'gba> Dmas<'gba> { impl Dmas<'_> {
unsafe fn new() -> Self { unsafe fn new() -> Self {
Self { Self {
phantom: PhantomData, phantom: PhantomData,
@ -137,7 +137,7 @@ where
phantom: PhantomData<&'a ()>, phantom: PhantomData<&'a ()>,
} }
impl<'a, T> DmaTransferHandle<'a, T> impl<T> DmaTransferHandle<'_, T>
where where
T: Copy, T: Copy,
{ {
@ -150,7 +150,7 @@ where
} }
} }
impl<'a, T> Drop for DmaTransferHandle<'a, T> impl<T> Drop for DmaTransferHandle<'_, T>
where where
T: Copy, T: Copy,
{ {

View file

@ -88,7 +88,7 @@ impl<'bitmap, 'gba> BitmapTextRender<'bitmap, 'gba> {
} }
} }
impl<'bitmap, 'gba> Write for BitmapTextRender<'bitmap, 'gba> { impl Write for BitmapTextRender<'_, '_> {
fn write_str(&mut self, s: &str) -> core::fmt::Result { fn write_str(&mut self, s: &str) -> core::fmt::Result {
for c in s.chars() { for c in s.chars() {
self.render_char(c); self.render_char(c);

View file

@ -305,7 +305,7 @@ pub struct SavePreparedBlock<'a> {
parent: &'a mut SaveData, parent: &'a mut SaveData,
range: Range<usize>, range: Range<usize>,
} }
impl<'a> SavePreparedBlock<'a> { impl SavePreparedBlock<'_> {
/// Writes a given buffer into the save media. /// Writes a given buffer into the save media.
/// ///
/// Multiple overlapping writes to the same memory range without a separate /// Multiple overlapping writes to the same memory range without a separate

View file

@ -53,7 +53,7 @@ unsafe impl Sync for RawLock {}
/// A guard representing an active lock on an [`RawLock`]. /// A guard representing an active lock on an [`RawLock`].
pub struct RawLockGuard<'a>(&'a RawLock); pub struct RawLockGuard<'a>(&'a RawLock);
impl<'a> Drop for RawLockGuard<'a> { impl Drop for RawLockGuard<'_> {
fn drop(&mut self) { fn drop(&mut self) {
self.0.raw_unlock(); self.0.raw_unlock();
} }
@ -103,18 +103,18 @@ pub struct LockGuard<'a, T> {
underlying: &'a Lock<T>, underlying: &'a Lock<T>,
ptr: *mut T, ptr: *mut T,
} }
impl<'a, T> Drop for LockGuard<'a, T> { impl<T> Drop for LockGuard<'_, T> {
fn drop(&mut self) { fn drop(&mut self) {
self.underlying.raw.raw_unlock(); self.underlying.raw.raw_unlock();
} }
} }
impl<'a, T> Deref for LockGuard<'a, T> { impl<T> Deref for LockGuard<'_, T> {
type Target = T; type Target = T;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
unsafe { &*self.ptr } unsafe { &*self.ptr }
} }
} }
impl<'a, T> DerefMut for LockGuard<'a, T> { impl<T> DerefMut for LockGuard<'_, T> {
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
unsafe { &mut *self.ptr } unsafe { &mut *self.ptr }
} }

View file

@ -100,7 +100,7 @@ struct Construction<'a, 'b> {
background: &'a mut MapLoan<'b, RegularMap>, background: &'a mut MapLoan<'b, RegularMap>,
} }
impl<'a, 'b> Drop for Construction<'a, 'b> { impl Drop for Construction<'_, '_> {
fn drop(&mut self) { fn drop(&mut self) {
self.background.set_visible(false); self.background.set_visible(false);
} }

View file

@ -273,7 +273,7 @@ struct Map<'a, 'b> {
level: &'a Level, level: &'a Level,
} }
impl<'a, 'b> Map<'a, 'b> { impl Map<'_, '_> {
pub fn commit_position(&mut self, vram: &mut VRamManager) { pub fn commit_position(&mut self, vram: &mut VRamManager) {
self.background.set_pos(vram, self.position.floor()); self.background.set_pos(vram, self.position.floor());
self.foreground.set_pos(vram, self.position.floor()); self.foreground.set_pos(vram, self.position.floor());

View file

@ -719,7 +719,7 @@ impl SoundChannel for agb::sound::mixer::SoundChannel {
} }
#[cfg(feature = "agb")] #[cfg(feature = "agb")]
impl<'gba> Mixer for agb::sound::mixer::Mixer<'gba> { impl Mixer for agb::sound::mixer::Mixer<'_> {
type ChannelId = agb::sound::mixer::ChannelId; type ChannelId = agb::sound::mixer::ChannelId;
type SoundChannel = agb::sound::mixer::SoundChannel; type SoundChannel = agb::sound::mixer::SoundChannel;