Reformat with the 2024 rustfmt style edition

rustfmt.toml

@@ -1 +0,0 @@
-style_edition = "2021"

showbits-common/src/tree.rs

@@ -2,7 +2,7 @@ use image::RgbaImage;
 use palette::Srgba;
 use taffy::{AvailableSpace, NodeId, Point, Size, TaffyResult, TaffyTree};
 
-use crate::{color, BoxedWidget, Rect, Vec2, View};
+use crate::{BoxedWidget, Rect, Vec2, View, color};
 
 fn point_to_vec2(point: Point<f32>) -> Vec2 {
     Vec2::new(point.x as i32, point.y as i32)

showbits-common/src/view.rs

@@ -1,7 +1,7 @@
 use image::RgbaImage;
-use palette::{blend::Compose, Srgba};
+use palette::{Srgba, blend::Compose};
 
-use crate::{color, Rect, Vec2};
+use crate::{Rect, Vec2, color};
 
 pub struct View<'a> {
     area: Rect,

showbits-common/src/widgets/block.rs

@@ -1,7 +1,7 @@
 use palette::Srgba;
 use taffy::Layout;
 
-use crate::{color, Rect, Vec2, View, Widget};
+use crate::{Rect, Vec2, View, Widget, color};
 
 pub struct Block {
     border: Srgba,

showbits-common/src/widgets/image.rs

@@ -1,6 +1,6 @@
 use image::{
-    imageops::{self, FilterType},
     RgbaImage,
+    imageops::{self, FilterType},
 };
 use mark::dither::{AlgoFloydSteinberg, AlgoStucki, Algorithm, DiffEuclid, Palette};
 use palette::{IntoColor, LinSrgb, Srgba};

showbits-common/src/widgets/text.rs

@@ -2,11 +2,11 @@ use cosmic_text::{Attrs, AttrsOwned, Buffer, Family, FontSystem, Metrics, Shapin
 use palette::Srgba;
 use showbits_assets::{UNIFONT, UNIFONT_JP, UNIFONT_NAME, UNIFONT_SIZE, UNIFONT_UPPER};
 use taffy::{
-    prelude::{AvailableSpace, Size},
     Layout,
+    prelude::{AvailableSpace, Size},
 };
 
-use crate::{color, Rect, Vec2, View, Widget};
+use crate::{Rect, Vec2, View, Widget, color};
 
 // https://github.com/DioxusLabs/taffy/blob/main/examples/cosmic_text.rs
 

showbits-common/src/widgets/typst.rs

@@ -4,10 +4,11 @@ use anyhow::anyhow;
 use comemo::Prehashed;
 use image::RgbaImage;
 use taffy::{
-    prelude::{AvailableSpace, Size},
     Layout,
+    prelude::{AvailableSpace, Size},
 };
 use typst::{
+    Library, World,
     diag::{FileError, FileResult},
     eval::Tracer,
     foundations::{Bytes, Datetime},
@@ -15,7 +16,6 @@ use typst::{
     syntax::{FileId, Source},
     text::{Font, FontBook},
     visualize::Color,
-    Library, World,
 };
 
 use crate::{View, Widget};

showbits-thermal-printer/src/drawer/calendar.rs

@@ -1,11 +1,11 @@
 use showbits_common::{
+    Node, Tree, WidgetExt,
     color::{BLACK, WHITE},
     widgets::{Block, Text},
-    Node, Tree, WidgetExt,
 };
 use taffy::{
-    style_helpers::{length, percent, repeat},
     AlignContent, AlignItems, Display, FlexDirection,
+    style_helpers::{length, percent, repeat},
 };
 use time::Date;
 

showbits-thermal-printer/src/drawer/cells.rs

@@ -1,9 +1,9 @@
 use image::{
-    imageops::{self, FilterType},
     Rgba, RgbaImage,
+    imageops::{self, FilterType},
 };
-use showbits_common::{color, widgets::Image, Node, Tree, WidgetExt};
+use showbits_common::{Node, Tree, WidgetExt, color, widgets::Image};
-use taffy::{style_helpers::percent, AlignItems, Display, FlexDirection};
+use taffy::{AlignItems, Display, FlexDirection, style_helpers::percent};
 
 use crate::printer::Printer;
 

showbits-thermal-printer/src/drawer/chat_message.rs

@@ -1,11 +1,11 @@
 use showbits_common::{
+    Node, Tree, WidgetExt,
     color::{BLACK, WHITE},
     widgets::{Block, Text},
-    Node, Tree, WidgetExt,
 };
 use taffy::{
-    style_helpers::{length, percent},
     AlignItems, Display, FlexDirection,
+    style_helpers::{length, percent},
 };
 
 use crate::printer::Printer;

showbits-thermal-printer/src/drawer/egg.rs

@@ -1,12 +1,12 @@
-use image::{imageops, RgbaImage};
+use image::{RgbaImage, imageops};
-use rand::{seq::SliceRandom, Rng};
+use rand::{Rng, seq::SliceRandom};
 use showbits_assets::{EGG_BAD_COVERS, EGG_BAD_PATTERNS, EGG_COVERS, EGG_PATTERNS};
 use showbits_common::{
+    Node, Tree, WidgetExt,
     color::{self, WHITE},
     widgets::{Image, Text},
-    Node, Tree, WidgetExt,
 };
-use taffy::{style_helpers::percent, AlignItems, Display, FlexDirection};
+use taffy::{AlignItems, Display, FlexDirection, style_helpers::percent};
 
 use crate::printer::Printer;
 

showbits-thermal-printer/src/drawer/image.rs

@@ -1,11 +1,11 @@
 use image::RgbaImage;
 use palette::{FromColor, IntoColor, LinLumaa};
 use showbits_common::{
+    Node, Tree, WidgetExt,
     color::{self, BLACK, WHITE},
     widgets::Image,
-    Node, Tree, WidgetExt,
 };
-use taffy::{style_helpers::percent, AlignItems, Display, FlexDirection};
+use taffy::{AlignItems, Display, FlexDirection, style_helpers::percent};
 
 use crate::printer::Printer;
 

showbits-thermal-printer/src/drawer/photo.rs

@@ -1,12 +1,12 @@
 use image::{Luma, Pixel, RgbaImage};
 use showbits_common::{
+    Node, Tree, WidgetExt,
     color::{BLACK, WHITE},
     widgets::{Image, Text},
-    Node, Tree, WidgetExt,
 };
 use taffy::{
-    style_helpers::{length, percent},
     AlignItems, Display, FlexDirection,
+    style_helpers::{length, percent},
 };
 
 use crate::printer::Printer;

showbits-thermal-printer/src/drawer/text.rs

@@ -1,4 +1,4 @@
-use showbits_common::{color::WHITE, widgets::Text, Node, Tree, WidgetExt};
+use showbits_common::{Node, Tree, WidgetExt, color::WHITE, widgets::Text};
 use taffy::style_helpers::percent;
 
 use crate::printer::Printer;

showbits-thermal-printer/src/drawer/tictactoe.rs

@@ -1,11 +1,11 @@
 use showbits_common::{
+    Node, Tree, WidgetExt,
     color::{BLACK, WHITE},
     widgets::{Block, Text},
-    Node, Tree, WidgetExt,
 };
 use taffy::{
-    style_helpers::{length, percent, repeat},
     AlignItems, Display, FlexDirection,
+    style_helpers::{length, percent, repeat},
 };
 
 use crate::printer::Printer;

showbits-thermal-printer/src/drawer/typst.rs

@@ -1,4 +1,4 @@
-use showbits_common::{color::WHITE, widgets::Typst, Node, Tree, WidgetExt};
+use showbits_common::{Node, Tree, WidgetExt, color::WHITE, widgets::Typst};
 use taffy::style_helpers::percent;
 
 use crate::printer::Printer;

showbits-thermal-printer/src/printer.rs

@@ -3,10 +3,10 @@ use std::path::PathBuf;
 use escpos::{
     driver::FileDriver,
     printer::Printer as EPrinter,
-    utils::{PageCode, Protocol, GS},
+    utils::{GS, PageCode, Protocol},
 };
 use image::{Rgba, RgbaImage};
-use showbits_common::{color, Tree};
+use showbits_common::{Tree, color};
 use taffy::{AvailableSpace, NodeId, Size};
 
 pub struct Printer {

showbits-thermal-printer/src/server.rs

@@ -3,11 +3,11 @@ mod r#static;
 mod statuscode;
 
 use axum::{
+    Form, Router,
     extract::{DefaultBodyLimit, Multipart, State},
     http::StatusCode,
     response::{IntoResponse, Redirect, Response},
     routing::{get, post},
-    Form, Router,
 };
 use serde::Deserialize;
 use tokio::{net::TcpListener, sync::mpsc};

showbits-thermal-printer/src/server/static.rs

@@ -1,5 +1,5 @@
 use axum::{
-    http::{header, StatusCode, Uri},
+    http::{StatusCode, Uri, header},
     response::{IntoResponse, Response},
 };
 use rust_embed::RustEmbed;