Merge b4d8c1ab97 into 5d745ab8fd

src/main.rs

@@ -1,7 +1,8 @@
 #![warn(clippy::all, clippy::pedantic)]
 #![allow(clippy::unnecessary_debug_formatting)]
+#![allow(clippy::too_many_lines)]
 
-use std::{fs, fs::File, io::BufReader, path::PathBuf};
+use std::{fs, io::BufReader, path::PathBuf};
 
 use anyhow::{Context, Result};
 use base64::Engine;
@@ -14,10 +15,11 @@ use embedded_graphics::{
     text::Text,
     Drawable, Pixel,
 };
-use serde::Deserialize;
 use image::{
-    codecs::gif::GifDecoder, imageops::FilterType, AnimationDecoder, ImageReader, Pixel as iPixel,
+    codecs::gif::GifDecoder, imageops::FilterType, AnimationDecoder, ImageReader,
+    Pixel as ImagePixel,
 };
+use serde::Deserialize;
 
 use badgemagic::{
     ble::Device as BleDevice,
@@ -235,7 +237,7 @@ fn generate_payload(args: &mut Args) -> Result<PayloadBuffer> {
                     .resize(u32::MAX, 11, FilterType::Nearest)
                     .into_luma8();
                 let (width, height) = img.dimensions();
-                let mut buffer = payload.add_message(style, (width as usize + 7) / 8);
+                let mut buffer = payload.add_message(style, (width as usize).div_ceil(8));
                 for y in 0..height {
                     for x in 0..width {
                         if img.get_pixel(x, y).0 > [31] {
@@ -246,7 +248,7 @@ fn generate_payload(args: &mut Args) -> Result<PayloadBuffer> {
                 }
             }
             Content::GifFile { gif_file } => {
-                let file_in = BufReader::new(File::open(gif_file)?);
+                let file_in = BufReader::new(fs::File::open(gif_file)?);
                 let frames = GifDecoder::new(file_in)?
                     .into_frames()
                     .collect_frames()
@@ -258,7 +260,7 @@ fn generate_payload(args: &mut Args) -> Result<PayloadBuffer> {
                     anyhow::bail!("Expected 44x11 pixel gif file");
                 }
 
-                let mut buffer = payload.add_message(style, (48 * frame_count + 7) / 8);
+                let mut buffer = payload.add_message(style, (48 * frame_count).div_ceil(8));
 
                 for (i, frame) in frames.iter().enumerate() {
                     let buf = frame.buffer();