From 6bc387cdf633b2d4df7eda4612bb843f13dfc6bc Mon Sep 17 00:00:00 2001 From: Daniel Beckwith Date: Tue, 31 Mar 2020 18:37:42 -0400 Subject: [PATCH] Fix lint --- src/writers/graphics_320x200x256.rs | 2 +- src/writers/graphics_640x480x16.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/writers/graphics_320x200x256.rs b/src/writers/graphics_320x200x256.rs index ba31144..e2c8cc0 100644 --- a/src/writers/graphics_320x200x256.rs +++ b/src/writers/graphics_320x200x256.rs @@ -97,7 +97,7 @@ impl Graphics320x200x256 { /// Returns the start of the `FrameBuffer` as `*mut u8` as /// well as a lock to the vga driver. This ensures the vga /// driver stays locked while the frame buffer is in use. - fn get_frame_buffer(self) -> (SpinlockGuard, *mut u8) { + fn get_frame_buffer(self) -> (SpinlockGuard<'static, Vga>, *mut u8) { let mut vga = VGA.lock(); let frame_buffer = vga.get_frame_buffer(); (vga, u32::from(frame_buffer) as *mut u8) diff --git a/src/writers/graphics_640x480x16.rs b/src/writers/graphics_640x480x16.rs index 3af89c7..43a42b0 100644 --- a/src/writers/graphics_640x480x16.rs +++ b/src/writers/graphics_640x480x16.rs @@ -127,7 +127,7 @@ impl Graphics640x480x16 { /// Returns the start of the `FrameBuffer` as `*mut u8` as /// well as a lock to the vga driver. This ensures the vga /// driver stays locked while the frame buffer is in use. - fn get_frame_buffer(self) -> (SpinlockGuard, *mut u8) { + fn get_frame_buffer(self) -> (SpinlockGuard<'static, Vga>, *mut u8) { let mut vga = VGA.lock(); let frame_buffer = vga.get_frame_buffer(); (vga, u32::from(frame_buffer) as *mut u8)