Update toolchain, deps

Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0-only"
 lto = true
 
 [dependencies]
-orbclient = { version = "0.3.46", default-features = false }
+orbclient = { version = "=0.3.51", default-features = false }
 orbfont = { version = "0.1.12", default-features = false, features = ["no-std"] }
 redox_uefi_std = "0.1.14"
 system76_ectool = { git = "https://github.com/system76/ec.git", default-features = false, features = ["redox_hwio"] }

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.85.0"
+channel = "1.95.0"
 targets = ["x86_64-unknown-uefi"]
 profile = "minimal"

src/fde.rs

@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#![allow(clippy::collapsible_if)]
+#![allow(clippy::collapsible_match)]
+
 use core::{char, cmp, mem, ptr, slice};
 use orbclient::{Color, Renderer};
 use orbfont::Text;
@@ -177,7 +180,7 @@ where
 pub struct ListHead<T>(ListEntry<T>);
 
 impl<T> ListHead<T> {
-    pub fn iter(&self) -> ListEntryIter<T> {
+    pub fn iter(&self) -> ListEntryIter<'_, T> {
         let next = self.0.next();
         ListEntryIter {
             start: next,

src/image/bmp.rs

@@ -35,8 +35,8 @@ pub fn parse(file_data: &[u8]) -> core::result::Result<Image, String> {
         let height = getd(0x16);
         let depth = getw(0x1C) as u32;
 
-        let bytes = (depth + 7) / 8;
-        let row_bytes = (depth * width + 31) / 32 * 4;
+        let bytes = depth.div_ceil(8);
+        let row_bytes = (depth * width).div_ceil(32) * 4;
 
         let mut blue_mask = 0xFF;
         let mut green_mask = 0xFF00;

src/image/mod.rs

@@ -79,7 +79,7 @@ impl Image {
     }
 
     /// Get a piece of the image
-    pub fn roi(&self, x: u32, y: u32, w: u32, h: u32) -> ImageRoi {
+    pub fn roi(&self, x: u32, y: u32, w: u32, h: u32) -> ImageRoi<'_> {
         let x1 = cmp::min(x, self.width());
         let y1 = cmp::min(y, self.height());
         let x2 = cmp::max(x1, cmp::min(x + w, self.width()));

src/security.rs

@@ -192,6 +192,7 @@ pub(crate) fn confirm(display: &mut Display) -> Result<()> {
             }
             Key::Character(c) => match c {
                 '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' => {
+                    #[allow(clippy::collapsible_match)]
                     if input.len() < code.len() {
                         input.push(c);
                     }
@@ -216,6 +217,7 @@ pub(crate) fn confirm(display: &mut Display) -> Result<()> {
                 input.clear();
             }
             Key::Down => {
+                #[allow(clippy::collapsible_match)]
                 if button_i + 1 < buttons.len() {
                     button_i += 1;
                 }

src/ui.rs

@@ -90,7 +90,7 @@ impl Ui {
     }
 
     //TODO: move to orbfont and optimize
-    pub fn render_text_wrapped(&self, string: &str, font_size: f32, width: u32) -> Vec<Text> {
+    pub fn render_text_wrapped(&self, string: &str, font_size: f32, width: u32) -> Vec<Text<'_>> {
         let mut texts = Vec::new();
 
         //TODO: support different whitespace differently, like newline?