diff --git a/agb/src/display/blend.rs b/agb/src/display/blend.rs index 01443e632..35bbd70c9 100644 --- a/agb/src/display/blend.rs +++ b/agb/src/display/blend.rs @@ -60,7 +60,7 @@ pub struct BlendLayer<'blend, 'gba> { layer: Layer, } -impl<'gba> BlendLayer<'_, 'gba> { +impl BlendLayer<'_, '_> { /// Set whether a background is enabled for blending on this layer. pub fn set_background_enable(&mut self, background: BackgroundID, enable: bool) -> &mut Self { self.blend diff --git a/agb/src/display/font.rs b/agb/src/display/font.rs index ae3bde95d..389abe206 100644 --- a/agb/src/display/font.rs +++ b/agb/src/display/font.rs @@ -135,7 +135,7 @@ pub struct TextWriter<'a, 'b> { 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> { for c in text.chars() { 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) { self.text_renderer.commit(self.bg, self.vram_manager); } diff --git a/agb/src/display/object/font/preprocess.rs b/agb/src/display/object/font/preprocess.rs index 714350741..f91359c71 100644 --- a/agb/src/display/object/font/preprocess.rs +++ b/agb/src/display/object/font/preprocess.rs @@ -134,7 +134,7 @@ impl Line { } } -impl<'pre> Iterator for Lines<'pre> { +impl Iterator for Lines<'_> { type Item = Line; fn next(&mut self) -> Option { diff --git a/agb/src/display/object/unmanaged/object.rs b/agb/src/display/object/unmanaged/object.rs index f8ebcedd9..d4497c3bc 100644 --- a/agb/src/display/object/unmanaged/object.rs +++ b/agb/src/display/object/unmanaged/object.rs @@ -70,7 +70,7 @@ pub struct OamIterator<'oam> { frame_data: &'oam UnsafeCell, } -impl<'oam> OamIterator<'oam> { +impl OamIterator<'_> { /// Sets the next oam slot with the provided `object`. /// /// Is equivalent to the following: diff --git a/agb/src/display/tiled/map.rs b/agb/src/display/tiled/map.rs index 5cd342952..248e5693b 100644 --- a/agb/src/display/tiled/map.rs +++ b/agb/src/display/tiled/map.rs @@ -487,7 +487,7 @@ pub struct MapLoan<'a, T> { screenblock_list: &'a RefCell>, } -impl<'a, T> Deref for MapLoan<'a, T> { +impl Deref for MapLoan<'_, T> { type Target = T; 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 DerefMut for MapLoan<'_, T> { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.map } @@ -526,7 +526,7 @@ impl<'a, T> MapLoan<'a, T> { } } -impl<'a, T> Drop for MapLoan<'a, T> { +impl Drop for MapLoan<'_, T> { fn drop(&mut self) { self.map_list .borrow_mut() diff --git a/agb/src/display/window.rs b/agb/src/display/window.rs index f9accbd1c..e248d1f22 100644 --- a/agb/src/display/window.rs +++ b/agb/src/display/window.rs @@ -31,7 +31,7 @@ pub enum WinIn { Win1, } -impl<'gba> Windows<'gba> { +impl Windows<'_> { pub(crate) fn new() -> Self { let s = Self { wins: [MovableWindow::new(0), MovableWindow::new(1)], diff --git a/agb/src/dma.rs b/agb/src/dma.rs index a16fc0216..4f17e2cda 100644 --- a/agb/src/dma.rs +++ b/agb/src/dma.rs @@ -24,7 +24,7 @@ pub struct Dmas<'gba> { pub dma3: Dma, } -impl<'gba> Dmas<'gba> { +impl Dmas<'_> { unsafe fn new() -> Self { Self { phantom: PhantomData, @@ -137,7 +137,7 @@ where phantom: PhantomData<&'a ()>, } -impl<'a, T> DmaTransferHandle<'a, T> +impl DmaTransferHandle<'_, T> where T: Copy, { @@ -150,7 +150,7 @@ where } } -impl<'a, T> Drop for DmaTransferHandle<'a, T> +impl Drop for DmaTransferHandle<'_, T> where T: Copy, { diff --git a/agb/src/panics_render/text.rs b/agb/src/panics_render/text.rs index c0d09aec9..0438da14b 100644 --- a/agb/src/panics_render/text.rs +++ b/agb/src/panics_render/text.rs @@ -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 { for c in s.chars() { self.render_char(c); diff --git a/agb/src/save/mod.rs b/agb/src/save/mod.rs index 7adb1d718..e3c05d544 100644 --- a/agb/src/save/mod.rs +++ b/agb/src/save/mod.rs @@ -305,7 +305,7 @@ pub struct SavePreparedBlock<'a> { parent: &'a mut SaveData, range: Range, } -impl<'a> SavePreparedBlock<'a> { +impl SavePreparedBlock<'_> { /// Writes a given buffer into the save media. /// /// Multiple overlapping writes to the same memory range without a separate diff --git a/agb/src/sync.rs b/agb/src/sync.rs index d614662f5..2ee996bc7 100644 --- a/agb/src/sync.rs +++ b/agb/src/sync.rs @@ -53,7 +53,7 @@ unsafe impl Sync for RawLock {} /// A guard representing an active lock on an [`RawLock`]. pub struct RawLockGuard<'a>(&'a RawLock); -impl<'a> Drop for RawLockGuard<'a> { +impl Drop for RawLockGuard<'_> { fn drop(&mut self) { self.0.raw_unlock(); } @@ -103,18 +103,18 @@ pub struct LockGuard<'a, T> { underlying: &'a Lock, ptr: *mut T, } -impl<'a, T> Drop for LockGuard<'a, T> { +impl Drop for LockGuard<'_, T> { fn drop(&mut self) { self.underlying.raw.raw_unlock(); } } -impl<'a, T> Deref for LockGuard<'a, T> { +impl Deref for LockGuard<'_, T> { type Target = T; fn deref(&self) -> &Self::Target { unsafe { &*self.ptr } } } -impl<'a, T> DerefMut for LockGuard<'a, T> { +impl DerefMut for LockGuard<'_, T> { fn deref_mut(&mut self) -> &mut Self::Target { unsafe { &mut *self.ptr } }