linter

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
 resolver = "3"
-members = ["types", "master", "worker"]
+members = ["master", "types", "worker"]

Dockerfile

@@ -1,9 +1,21 @@
 FROM rust:1.93.1-alpine3.23 AS builder
 
+RUN --mount=type=cache,target=/root/.cargo \
+    rustup component add clippy && \
+    rustup component add rustfmt --toolchain nightly
+
+RUN \
+    cargo install cargo-sort
+
 WORKDIR /build
 
 COPY . .
 
+RUN --mount=type=cache,target=/build/target \
+    cargo sort ./**/Cargo.toml --check && \
+    cargo clippy && \
+    cargo +nightly fmt --check
+
 RUN --mount=type=cache,target=/build/target \
     mkdir release && \
     cargo build --workspace --release && \

master/Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-types = { path = "../types" }
 async-nats = { version = "0.46.0" }
+postcard = { version = "1.1.3", features = ["use-std"] }
 serenity = { version = "0.12.5", default-features = false, features = [
     "client",
     "gateway",
@@ -14,5 +14,5 @@ serenity = { version = "0.12.5", default-features = false, features = [
     "collector",
 ] }
 tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
-postcard = { version = "1.1.3", features = ["use-std"] }
+types = { path = "../types" }
 uuid = { version = "1.21.0" }

master/src/commands/modal.rs

@@ -1,7 +1,4 @@
-use serenity::builder::*;
+use serenity::{builder::*, model::prelude::*, prelude::*, utils::CreateQuickModal};
-use serenity::model::prelude::*;
-use serenity::prelude::*;
-use serenity::utils::CreateQuickModal;
 
 pub async fn run(ctx: &Context, interaction: &CommandInteraction) -> Result<(), serenity::Error> {
     let modal = CreateQuickModal::new("About you")

master/src/commands/ping.rs

@@ -1,5 +1,4 @@
-use serenity::builder::CreateCommand;
+use serenity::{builder::CreateCommand, model::application::ResolvedOption};
-use serenity::model::application::ResolvedOption;
 
 pub fn run(_options: &[ResolvedOption]) -> String {
     "Hey, I'm alive!".to_string()

master/src/commands/testnats.rs

@@ -1,14 +1,19 @@
-use serenity::all::{
-    CommandInteraction, Context, CreateCommandOption, CreateInteractionResponse,
-    CreateInteractionResponseMessage,
-};
-use serenity::builder::CreateCommand;
-use serenity::model::application::{CommandOptionType, ResolvedOption, ResolvedValue};
-
 use postcard::to_stdvec;
-
+use serenity::{
-use types::jobs::{InnerStruct, Job, JobKind};
+    all::{
-use types::misc::new_uuid_v4;
+        CommandInteraction,
+        Context,
+        CreateCommandOption,
+        CreateInteractionResponse,
+        CreateInteractionResponseMessage,
+    },
+    builder::CreateCommand,
+    model::application::{CommandOptionType, ResolvedOption, ResolvedValue},
+};
+use types::{
+    jobs::{InnerStruct, Job, JobKind},
+    misc::new_uuid_v4,
+};
 
 pub async fn run(
     ctx: &Context,

master/src/main.rs

@@ -2,11 +2,16 @@ mod commands;
 
 use std::env;
 
-use serenity::async_trait;
+use serenity::{
-use serenity::builder::{CreateInteractionResponse, CreateInteractionResponseMessage};
+    Client,
-use serenity::model::application::{Command, Interaction};
+    all::{Context, EventHandler, GatewayIntents},
-use serenity::model::gateway::Ready;
+    async_trait,
-use serenity::prelude::*;
+    builder::{CreateInteractionResponse, CreateInteractionResponseMessage},
+    model::{
+        application::{Command, Interaction},
+        gateway::Ready,
+    },
+};
 
 struct Handler {
     nats_client: async_nats::Client,

rustfmt.toml

@@ -0,0 +1,4 @@
+imports_granularity = "Crate"
+imports_layout = "HorizontalVertical"
+group_imports = "StdExternalCrate"
+reorder_imports = true

types/Cargo.toml

@@ -5,4 +5,4 @@ edition = "2024"
 
 [dependencies]
 serde = { version = "1.0.228" }
-uuid = { version = "1.21.0", features = ["serde", "v4"]}
+uuid = { version = "1.21.0", features = ["serde", "v4"] }

types/src/misc.rs

@@ -1,5 +1,5 @@
 use uuid::Uuid;
 
-pub fn new_uuid_v4() -> Uuid{
+pub fn new_uuid_v4() -> Uuid {
     Uuid::new_v4()
 }

worker/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-types = { path = "../types" }
 async-nats = { version = "0.46.0" }
 futures = { version = "0.3.32" }
 futures-executor = { version = "0.3.32" }
-tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
 postcard = { version = "1.1.3", features = ["use-std"] }
-yt-dlp = { version = "2.1.0" }
+tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
+types = { path = "../types" }
 which = { version = "8.0.0" }
+yt-dlp = { version = "2.1.0" }

worker/src/main.rs

@@ -1,12 +1,9 @@
 use core::ops::Deref;
-use std::path::PathBuf;
-use which::which;
 
 use futures::StreamExt;
-
 use postcard::from_bytes;
-
 use types::jobs::Job;
+use which::which;
 use yt_dlp::{Downloader, client::Libraries};
 
 #[tokio::main]
@@ -19,10 +16,7 @@ async fn main() {
         .await
         .unwrap();
 
-    let libraries = Libraries::new(
+    let libraries = Libraries::new(which("yt-dlp").unwrap(), which("ffmpeg").unwrap());
-        PathBuf::from(which("yt-dlp").unwrap()),
-        PathBuf::from(which("ffmpeg").unwrap()),
-    );
     let downloader = Downloader::builder(libraries, "output")
         .build()
         .await