Merge pull request #330 from rkuklik/main

Improve cargo workspace
LGFae · Jun 18, 2024 · 1bb137b · 1bb137b
2 parents 57f5337 + 18cee57
commit 1bb137b
Show file tree

Hide file tree

Showing 34 changed files with 131 additions and 97 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/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,29 @@
 [workspace]
-members = [".", "daemon", "utils"]
-default-members = [".", "daemon"]
+members = ["client", "daemon", "common"]
+default-members = ["client", "daemon"]
 
-[package]
-name = "swww"
+[workspace.package]
 version = "0.9.5-masterV2"
 authors = ["Leonardo Gibrowski Faé <leonardo.fae44@gmail.com>"]
 edition = "2021"
+license-file = "LICENSE"
 rust-version = "1.75"
 
+[workspace.dependencies]
+common = { path = "common" }
+
+[workspace.lints.clippy]
+correctness = { level = "deny", priority = -1 }
+suspicious = { level = "deny", priority = -1 }
+perf = { level = "deny", priority = -1 }
+style = { level = "deny", priority = -1 }
+complexity = { level = "warn", priority = -1 }
+#pedantic = { level = "warn", priority = -1 }
+
+module-name-repetitions = "allow"
+missing-errors-doc = "allow"
+missing-panics-doc = "allow"
+
 # Enable some optimizations in debug mode. Otherwise, it is a pain to test it
 [profile.dev]
 opt-level = 1
@@ -28,34 +43,3 @@ strip = true
 lto = "thin"
 debug = 1
 strip = false
-
-[dependencies]
-image = { version = "0.25", default-features = false, features = [
-	# all formats, except avif, since avif compiles just rav1d, which is just an
-	# encoder, which we do not care about
-	"bmp",
-	"dds",
-	"exr",
-	"ff",
-	"gif",
-	"hdr",
-	"ico",
-	"jpeg",
-	"png",
-	"pnm",
-	"qoi",
-	"tga",
-	"tiff",
-	"webp",
-]}
-fast_image_resize = "4.0"
-clap = { version = "4.5", features = ["derive", "wrap_help", "env"] }
-fastrand = { version = "2.1", default-features = false, features = [ "std" ] }
-utils = { version = "0.9.5-masterV2", path = "utils" }
-
-[dev-dependencies]
-assert_cmd = "2.0"
-
-[build-dependencies]
-clap = { version = "4.5", features = ["derive", "env"] }
-clap_complete = "4.5"
diff --git a/build.nix b/build.nix
@@ -8,7 +8,7 @@
   scdoc,
   nix-gitignore,
 }: let
-  version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
+  version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).workspace.package.version;
   src = nix-gitignore.gitignoreSource [] ./.;
 in
 rustPlatform.buildRustPackage {

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "swww"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license-file.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+image = { version = "0.25", default-features = false, features = [
+  # all formats, except avif, since avif compiles just rav1d, which is just an
+  # encoder, which we do not care about
+  "bmp",
+  "dds",
+  "exr",
+  "ff",
+  "gif",
+  "hdr",
+  "ico",
+  "jpeg",
+  "png",
+  "pnm",
+  "qoi",
+  "tga",
+  "tiff",
+  "webp",
+] }
+fast_image_resize = "4.0"
+clap = { version = "4.5", features = ["derive", "wrap_help", "env"] }
+fastrand = { version = "2.1", default-features = false, features = ["std"] }
+common = { workspace = true }
+
+[dev-dependencies]
+assert_cmd = "2.0"
+
+[build-dependencies]
+clap = { version = "4.5", features = ["derive", "env"] }
+clap_complete = "4.5"
diff --git a/build.rs → client/build.rs b/build.rs → client/build.rs
@@ -5,7 +5,7 @@ use clap_complete::{generate_to, Shell};
 
 include!("src/cli.rs");
 
-const COMPLETION_DIR: &str = "completions";
+const COMPLETION_DIR: &str = "../completions";
 const APP_NAME: &str = "swww";
 
 fn main() -> Result<(), Error> {

diff --git a/src/cli.rs → client/src/cli.rs b/src/cli.rs → client/src/cli.rs
diff --git a/src/imgproc.rs → client/src/imgproc.rs b/src/imgproc.rs → client/src/imgproc.rs
@@ -9,7 +9,7 @@ use std::{
     time::Duration,
 };
 
-use utils::{
+use common::{
     compression::{BitPack, Compressor},
     ipc::{self, Coord, PixelFormat, Position},
 };

diff --git a/src/main.rs → client/src/main.rs b/src/main.rs → client/src/main.rs
@@ -1,7 +1,7 @@
 use clap::Parser;
 use std::time::Duration;
 
-use utils::{
+use common::{
     cache,
     ipc::{self, connect_to_socket, get_socket_path, read_socket, Answer, RequestSend},
 };
@@ -266,7 +266,7 @@ fn restore_from_cache(requested_outputs: &[String]) -> Result<(), String> {
     let (_, _, outputs) = get_format_dims_and_outputs(requested_outputs)?;
 
     for output in outputs.iter().flatten() {
-        let img_path = utils::cache::get_previous_image_path(output)
+        let img_path = common::cache::get_previous_image_path(output)
             .map_err(|e| format!("failed to get previous image path: {e}"))?;
         #[allow(deprecated)]
         if let Err(e) = process_swww_args(&Swww::Img(cli::Img {

diff --git a/utils/Cargo.toml → common/Cargo.toml b/utils/Cargo.toml → common/Cargo.toml
@@ -1,18 +1,28 @@
 [package]
-name = "utils"
-version = "0.9.5-masterV2"
-authors = ["Leonardo Gibrowski Faé <leonardo.fae44@gmail.com>"]
-edition = "2021"
-license-file = "../LICENSE"
+name = "common"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license-file.workspace = true
+
+[lints]
+workspace = true
 
 [dependencies]
-rustix = { version = "0.38", default-features = false, features = [ "std", "net", "shm", "mm", "param" ] }
+rustix = { version = "0.38", default-features = false, features = [
+  "std",
+  "net",
+  "shm",
+  "mm",
+  "param",
+] }
 
 [build-dependencies]
 pkg-config = "0.3"
 
 [dev-dependencies]
-fastrand = { version = "2.1", default-features = false, features = [ "std" ] }
+fastrand = { version = "2.1", default-features = false, features = ["std"] }
 criterion = { version = "0.5", default-features = false }
 
 [[bench]]

diff --git a/utils/benches/compression.rs → common/benches/compression.rs b/utils/benches/compression.rs → common/benches/compression.rs
@@ -1,5 +1,5 @@
+use common::compression::{Compressor, Decompressor};
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use utils::compression::{Compressor, Decompressor};
 
 fn generate_data() -> (Box<[u8]>, Box<[u8]>) {
     let v1 = vec![120; 1920 * 1080 * 3];
@@ -45,7 +45,7 @@ pub fn compression_and_decompression(c: &mut Criterion) {
         b.iter(|| {
             black_box(
                 compressor
-                    .compress(&prev, &cur, utils::ipc::PixelFormat::Xrgb)
+                    .compress(&prev, &cur, common::ipc::PixelFormat::Xrgb)
                     .is_some(),
             )
         })
@@ -54,14 +54,18 @@ pub fn compression_and_decompression(c: &mut Criterion) {
 
     let mut decomp = c.benchmark_group("decompression 4 channels");
     let bitpack = compressor
-        .compress(&prev, &cur, utils::ipc::PixelFormat::Xrgb)
+        .compress(&prev, &cur, common::ipc::PixelFormat::Xrgb)
         .unwrap();
     let mut canvas = buf_from(&prev);
 
     let mut decompressor = Decompressor::new();
     decomp.bench_function("Full", |b| {
         b.iter(|| {
-            black_box(decompressor.decompress(&bitpack, &mut canvas, utils::ipc::PixelFormat::Xrgb))
+            black_box(decompressor.decompress(
+                &bitpack,
+                &mut canvas,
+                common::ipc::PixelFormat::Xrgb,
+            ))
         })
     });
 

diff --git a/utils/build.rs → common/build.rs b/utils/build.rs → common/build.rs
diff --git a/utils/src/cache.rs → common/src/cache.rs b/utils/src/cache.rs → common/src/cache.rs
diff --git a/utils/src/compression/comp/mod.rs → common/src/compression/comp/mod.rs b/utils/src/compression/comp/mod.rs → common/src/compression/comp/mod.rs
diff --git a/utils/src/compression/comp/sse2.rs → common/src/compression/comp/sse2.rs b/utils/src/compression/comp/sse2.rs → common/src/compression/comp/sse2.rs
diff --git a/utils/src/compression/cpu.rs → common/src/compression/cpu.rs b/utils/src/compression/cpu.rs → common/src/compression/cpu.rs
diff --git a/utils/src/compression/decomp/mod.rs → common/src/compression/decomp/mod.rs b/utils/src/compression/decomp/mod.rs → common/src/compression/decomp/mod.rs
diff --git a/utils/src/compression/decomp/ssse3.rs → common/src/compression/decomp/ssse3.rs b/utils/src/compression/decomp/ssse3.rs → common/src/compression/decomp/ssse3.rs
diff --git a/utils/src/compression/mod.rs → common/src/compression/mod.rs b/utils/src/compression/mod.rs → common/src/compression/mod.rs
diff --git a/utils/src/ipc/mmap.rs → common/src/ipc/mmap.rs b/utils/src/ipc/mmap.rs → common/src/ipc/mmap.rs
diff --git a/utils/src/ipc/mod.rs → common/src/ipc/mod.rs b/utils/src/ipc/mod.rs → common/src/ipc/mod.rs
diff --git a/utils/src/ipc/socket.rs → common/src/ipc/socket.rs b/utils/src/ipc/socket.rs → common/src/ipc/socket.rs
diff --git a/utils/src/ipc/types.rs → common/src/ipc/types.rs b/utils/src/ipc/types.rs → common/src/ipc/types.rs
diff --git a/utils/src/lib.rs → common/src/lib.rs b/utils/src/lib.rs → common/src/lib.rs
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
@@ -1,19 +1,26 @@
 [package]
 name = "swww-daemon"
-version = "0.9.5-masterV2"
-authors = ["Leonardo Gibrowski Faé <leonardo.fae44@gmail.com>"]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license-file.workspace = true
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lints]
+workspace = true
 
 [dependencies]
-log = { version = "0.4", default_features = false, features = [ "max_level_debug", "release_max_level_info", "std" ] }
+log = { version = "0.4", default-features = false, features = [
+  "max_level_debug",
+  "release_max_level_info",
+  "std",
+] }
 
-rustix = { version = "0.38", default-features = false, features = [ "event" ] }
+rustix = { version = "0.38", default-features = false, features = ["event"] }
 libc = "0.2"
 
 keyframe = "1.1"
 
 sd-notify = { version = "0.4.1" }
 
-utils = { version = "0.9.5-masterV2", path = "../utils" }
+common = { workspace = true }
diff --git a/daemon/src/animations/mod.rs b/daemon/src/animations/mod.rs
@@ -5,7 +5,7 @@ use std::{
     thread::{self, Scope},
 };
 
-use utils::{
+use common::{
     compression::Decompressor,
     ipc::{self, Animation, Answer, BgImg, ImgReq},
 };

diff --git a/daemon/src/animations/transitions.rs b/daemon/src/animations/transitions.rs
@@ -3,8 +3,8 @@ use std::{
     time::{Duration, Instant},
 };
 
+use common::ipc::{Position, TransitionType};
 use log::debug;
-use utils::ipc::{Position, TransitionType};
 
 use crate::{
     wallpaper::{AnimationToken, Wallpaper},
@@ -35,7 +35,7 @@ impl<'a> Transition<'a> {
     pub(super) fn new(
         wallpapers: &'a mut Vec<Arc<Wallpaper>>,
         dimensions: (u32, u32),
-        transition: &utils::ipc::Transition,
+        transition: &common::ipc::Transition,
     ) -> Self {
         Transition {
             animation_tokens: wallpapers

diff --git a/daemon/src/cli.rs b/daemon/src/cli.rs
@@ -1,4 +1,4 @@
-use utils::ipc::PixelFormat;
+use common::ipc::PixelFormat;
 
 pub struct Cli {
     pub format: Option<PixelFormat>,

diff --git a/daemon/src/main.rs b/daemon/src/main.rs
@@ -30,7 +30,7 @@ use std::{
     },
 };
 
-use utils::ipc::{
+use common::ipc::{
     connect_to_socket, get_socket_path, read_socket, Answer, BgInfo, ImageReq, MmappedStr,
     RequestRecv, RequestSend, Scale,
 };
@@ -125,7 +125,7 @@ impl Daemon {
     }
 
     fn recv_socket_msg(&mut self, stream: OwnedFd) {
-        let bytes = match utils::ipc::read_socket(&stream) {
+        let bytes = match common::ipc::read_socket(&stream) {
             Ok(bytes) => bytes,
             Err(e) => {
                 error!("FATAL: cannot read socket: {e}. Exiting...");
@@ -143,7 +143,7 @@ impl Daemon {
                     .spawn(move || {
                         crate::wallpaper::stop_animations(&wallpapers);
                         for wallpaper in &wallpapers {
-                            wallpaper.set_img_info(utils::ipc::BgImg::Color(clear.color));
+                            wallpaper.set_img_info(common::ipc::BgImg::Color(clear.color));
                             wallpaper.clear(clear.color);
                         }
                         crate::wallpaper::attach_buffers_and_damange_surfaces(&wallpapers);