fix(ci): rust-version detection and formatting

LGFae · Jun 18, 2024 · a2252dc · a2252dc
1 parent 0f1fdfc
commit a2252dc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,7 +38,7 @@ jobs:
         id: msrv
         with:
           file: 'Cargo.toml'
-          field: 'package.rust-version'
+          field: 'workspace.package.rust-version'
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ steps.msrv.outputs.value }}

diff --git a/common/benches/compression.rs b/common/benches/compression.rs
@@ -1,5 +1,5 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use common::compression::{Compressor, Decompressor};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 fn generate_data() -> (Box<[u8]>, Box<[u8]>) {
     let v1 = vec![120; 1920 * 1080 * 3];
@@ -61,7 +61,11 @@ pub fn compression_and_decompression(c: &mut Criterion) {
     let mut decompressor = Decompressor::new();
     decomp.bench_function("Full", |b| {
         b.iter(|| {
-            black_box(decompressor.decompress(&bitpack, &mut canvas, common::ipc::PixelFormat::Xrgb))
+            black_box(decompressor.decompress(
+                &bitpack,
+                &mut canvas,
+                common::ipc::PixelFormat::Xrgb,
+            ))
         })
     });
 

diff --git a/daemon/src/animations/transitions.rs b/daemon/src/animations/transitions.rs
@@ -3,8 +3,8 @@ use std::{
     time::{Duration, Instant},
 };
 
-use log::debug;
 use common::ipc::{Position, TransitionType};
+use log::debug;
 
 use crate::{
     wallpaper::{AnimationToken, Wallpaper},

diff --git a/daemon/src/wallpaper.rs b/daemon/src/wallpaper.rs
@@ -1,5 +1,5 @@
-use log::{debug, error, warn};
 use common::ipc::{BgImg, BgInfo, Scale};
+use log::{debug, error, warn};
 
 use std::{
     num::NonZeroI32,
@@ -487,7 +487,7 @@ pub(crate) fn commit_wallpapers(wallpapers: &[Arc<Wallpaper>]) {
 impl Drop for Wallpaper {
     fn drop(&mut self) {
         // note we shouldn't panic in a drop implementation
-       
+
         if let Err(e) = wp_viewport::req::destroy(self.wp_viewport) {
             error!("error destroying wp_viewport: {e:?}");
         }

diff --git a/daemon/src/wayland/globals.rs b/daemon/src/wayland/globals.rs
@@ -17,8 +17,8 @@ use rustix::{
     net::SocketAddrAny,
 };
 
-use log::{debug, error, info};
 use common::ipc::PixelFormat;
+use log::{debug, error, info};
 
 use super::{ObjectId, ObjectManager, WlDynObj};
 use std::{