Apply some clippy suggestions.

Author: jonathanpallant

src/main.rs

@@ -682,7 +682,7 @@ fn sign_on() {
 		}
 		if countdown == 1 {
 			break;
-		} else if countdown > 1 {
+		} else {
 			countdown -= 1;
 		}
 	}
@@ -1680,7 +1680,7 @@ pub extern "C" fn time_clock_set(time: common::Time) {
 			Ok(_) => {
 				defmt::info!("Time set in RTC OK");
 			}
-			Err(rtc::Error::BusError(_)) => {
+			Err(rtc::Error::Bus(_)) => {
 				defmt::warn!("Failed to talk to RTC to set time");
 			}
 			Err(rtc::Error::DriverBug) => {
@@ -2322,7 +2322,7 @@ unsafe fn HardFault(frame: &cortex_m_rt::ExceptionFrame) -> ! {
 	let tc = console::TextConsole::new();
 	tc.set_text_buffer(unsafe { &mut vga::GLYPH_ATTR_ARRAY });
 	for _col in 0..vga::MAX_TEXT_ROWS {
-		let _ = writeln!(&tc, "");
+		let _ = writeln!(&tc);
 	}
 	tc.move_to(0, 0);
 	tc.change_attr(Attr::new(

src/mcp23s17.rs

@@ -40,6 +40,7 @@ use super::SpiBus;
 /// Assumes the device is in `BANK = 0` mode.
 #[derive(defmt::Format, Debug, Copy, Clone, PartialEq, Eq)]
 #[repr(u8)]
+#[allow(clippy::upper_case_acronyms)]
 pub enum Register {
 	/// Data Direction Register A
 	DDRA = 0x00,

src/rtc.rs

@@ -37,7 +37,7 @@ pub use ds1307::{DateTimeAccess, NaiveDateTime};
 
 /// The ways this module can fail
 pub enum Error<E> {
-	BusError(E),
+	Bus(E),
 	DriverBug,
 	NoRtcFound,
 }
@@ -108,14 +108,14 @@ impl Rtc {
 			Self::Ds1307 => {
 				let mut driver = ds1307::Ds1307::new(bus);
 				driver.datetime().map_err(|e| match e {
-					ds1307::Error::I2C(bus_error) => Error::BusError(bus_error),
+					ds1307::Error::I2C(bus_error) => Error::Bus(bus_error),
 					ds1307::Error::InvalidInputData => Error::DriverBug,
 				})
 			}
 			Self::Mcp7940n => {
 				let mut driver = mcp794xx::Mcp794xx::new_mcp7940n(bus);
 				driver.datetime().map_err(|e| match e {
-					mcp794xx::Error::Comm(bus_error) => Error::BusError(bus_error),
+					mcp794xx::Error::Comm(bus_error) => Error::Bus(bus_error),
 					mcp794xx::Error::InvalidInputData => Error::DriverBug,
 				})
 			}
@@ -137,14 +137,14 @@ impl Rtc {
 			Self::Ds1307 => {
 				let mut driver = ds1307::Ds1307::new(bus);
 				driver.set_datetime(&new_time).map_err(|e| match e {
-					ds1307::Error::I2C(bus_error) => Error::BusError(bus_error),
+					ds1307::Error::I2C(bus_error) => Error::Bus(bus_error),
 					ds1307::Error::InvalidInputData => Error::DriverBug,
 				})
 			}
 			Self::Mcp7940n => {
 				let mut driver = mcp794xx::Mcp794xx::new_mcp7940n(bus);
 				driver.set_datetime(&new_time).map_err(|e| match e {
-					mcp794xx::Error::Comm(bus_error) => Error::BusError(bus_error),
+					mcp794xx::Error::Comm(bus_error) => Error::Bus(bus_error),
 					mcp794xx::Error::InvalidInputData => Error::DriverBug,
 				})
 			}

src/vga/mod.rs

@@ -1445,28 +1445,22 @@ pub fn set_video_mode(mode: crate::common::video::Mode) -> bool {
 	}
 }
 
-/// Sets the current video mode
+/// Check the given video mode is allowable
 pub fn test_video_mode(mode: crate::common::video::Mode) -> bool {
-	match (
-		mode.timing(),
-		mode.format(),
-		mode.is_horiz_2x(),
-		mode.is_vert_2x(),
-	) {
+	matches!(
 		(
-			crate::common::video::Timing::T640x480,
-			crate::common::video::Format::Text8x16 | crate::common::video::Format::Text8x8,
-			false,
-			false,
-		) => true,
+			mode.timing(),
+			mode.format(),
+			mode.is_horiz_2x(),
+			mode.is_vert_2x(),
+		),
 		(
-			crate::common::video::Timing::T640x400,
+			crate::common::video::Timing::T640x480 | crate::common::video::Timing::T640x400,
 			crate::common::video::Format::Text8x16 | crate::common::video::Format::Text8x8,
 			false,
 			false,
-		) => true,
-		_ => false,
-	}
+		)
+	)
 }
 
 /// Get the current scan line.