From febde452fb5b03f37bf1b4281cebb1fab4b1e427 Mon Sep 17 00:00:00 2001 From: ddidderr Date: Fri, 5 Jun 2026 09:19:23 +0200 Subject: [PATCH] fmt: add tombi format, run just fmt again --- Cargo.toml | 29 ++++++++++++------- crates/lanspread-compat/Cargo.toml | 22 +++++++------- crates/lanspread-db/Cargo.toml | 18 ++++++------ crates/lanspread-mdns/Cargo.toml | 20 ++++++------- crates/lanspread-peer-cli/Cargo.toml | 24 +++++++-------- crates/lanspread-peer/Cargo.toml | 12 ++++---- crates/lanspread-peer/src/context.rs | 1 - crates/lanspread-proto/Cargo.toml | 20 ++++++------- .../src-tauri/Cargo.toml | 28 +++++++++--------- crates/lanspread-utils/Cargo.toml | 10 +++---- justfile | 1 + supply-chain/audits.toml | 1 - supply-chain/config.toml | 1 - 13 files changed, 96 insertions(+), 91 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6928b55..51f4265 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,11 +25,15 @@ notify = "8" s2n-quic = { version = "1", features = ["provider-event-tracing"] } serde = { version = "1", features = ["derive"] } serde_json = "1" -sqlx = { version = "0.8", default-features = false, features = [ - "derive", - "runtime-tokio", - "sqlite", -] } +sqlx = { + version = "0.8", + default-features = false, + features = [ + "derive", + "runtime-tokio", + "sqlite", + ] +} strum = { version = "0.28", features = ["derive"] } tauri = { version = "2", features = [] } tauri-plugin-dialog = "2" @@ -41,12 +45,15 @@ tokio-util = { version = "0.7", features = ["codec", "rt"] } tracing = "0.1" uuid = { version = "1", features = ["v7"] } walkdir = "2" -windows = { version = "0.62", features = [ - "Win32", - "Win32_UI", - "Win32_UI_Shell", - "Win32_UI_WindowsAndMessaging", -] } +windows = { + version = "0.62", + features = [ + "Win32", + "Win32_UI", + "Win32_UI_Shell", + "Win32_UI_WindowsAndMessaging", + ] +} [profile.release] debug = true diff --git a/crates/lanspread-compat/Cargo.toml b/crates/lanspread-compat/Cargo.toml index 2418d6b..aaf5456 100644 --- a/crates/lanspread-compat/Cargo.toml +++ b/crates/lanspread-compat/Cargo.toml @@ -3,23 +3,23 @@ name = "lanspread-compat" version = "0.1.0" edition = "2024" -[lints.rust] -unsafe_code = "forbid" - -[lints.clippy] -pedantic = { level = "warn", priority = -1 } -todo = "warn" -unwrap_used = "warn" +[lib] +doctest = false +test = false [dependencies] # local lanspread-db = { path = "../lanspread-db" } eyre = { workspace = true } -sqlx = { workspace = true } serde = { workspace = true } +sqlx = { workspace = true } tracing = { workspace = true } -[lib] -test = false -doctest = false +[lints.clippy] +pedantic = { level = "warn", priority = -1 } +todo = "warn" +unwrap_used = "warn" + +[lints.rust] +unsafe_code = "forbid" diff --git a/crates/lanspread-db/Cargo.toml b/crates/lanspread-db/Cargo.toml index dbb3e9d..2ca4ef1 100644 --- a/crates/lanspread-db/Cargo.toml +++ b/crates/lanspread-db/Cargo.toml @@ -3,13 +3,8 @@ name = "lanspread-db" version = "0.1.0" edition = "2024" -[lints.rust] -unsafe_code = "forbid" - -[lints.clippy] -pedantic = { level = "warn", priority = -1 } -todo = "warn" -unwrap_used = "warn" +[lib] +doctest = false [dependencies] eyre = { workspace = true } @@ -17,5 +12,10 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } -[lib] -doctest = false +[lints.clippy] +pedantic = { level = "warn", priority = -1 } +todo = "warn" +unwrap_used = "warn" + +[lints.rust] +unsafe_code = "forbid" diff --git a/crates/lanspread-mdns/Cargo.toml b/crates/lanspread-mdns/Cargo.toml index f3a2d29..fd0f41a 100644 --- a/crates/lanspread-mdns/Cargo.toml +++ b/crates/lanspread-mdns/Cargo.toml @@ -3,19 +3,19 @@ name = "lanspread-mdns" version = "0.1.0" edition = "2024" -[lints.rust] -unsafe_code = "forbid" - -[lints.clippy] -pedantic = { level = "warn", priority = -1 } -todo = "warn" -unwrap_used = "warn" +[lib] +doctest = false +test = false [dependencies] eyre = { workspace = true } log = { workspace = true } mdns-sd = { workspace = true } -[lib] -test = false -doctest = false +[lints.clippy] +pedantic = { level = "warn", priority = -1 } +todo = "warn" +unwrap_used = "warn" + +[lints.rust] +unsafe_code = "forbid" diff --git a/crates/lanspread-peer-cli/Cargo.toml b/crates/lanspread-peer-cli/Cargo.toml index ef1b11a..7c18e7a 100644 --- a/crates/lanspread-peer-cli/Cargo.toml +++ b/crates/lanspread-peer-cli/Cargo.toml @@ -3,14 +3,12 @@ name = "lanspread-peer-cli" version = "0.1.0" edition = "2024" -[lints.rust] -unsafe_code = "forbid" +[lib] +doctest = false -[lints.clippy] -pedantic = { level = "warn", priority = -1 } -todo = "warn" -unwrap_used = "warn" -needless_pass_by_value = "allow" +[[bin]] +name = "lanspread-peer-cli" +path = "src/main.rs" [dependencies] lanspread-compat = { path = "../lanspread-compat" } @@ -22,9 +20,11 @@ serde = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true } -[lib] -doctest = false +[lints.clippy] +needless_pass_by_value = "allow" +pedantic = { level = "warn", priority = -1 } +todo = "warn" +unwrap_used = "warn" -[[bin]] -name = "lanspread-peer-cli" -path = "src/main.rs" +[lints.rust] +unsafe_code = "forbid" diff --git a/crates/lanspread-peer/Cargo.toml b/crates/lanspread-peer/Cargo.toml index 060d36e..e580140 100644 --- a/crates/lanspread-peer/Cargo.toml +++ b/crates/lanspread-peer/Cargo.toml @@ -3,10 +3,8 @@ name = "lanspread-peer" version = "0.1.0" edition = "2024" -[lints.clippy] -pedantic = { level = "warn", priority = -1 } -todo = "warn" -unwrap_used = "warn" +[lib] +doctest = false [dependencies] lanspread-db = { path = "../lanspread-db" } @@ -31,5 +29,7 @@ tokio-util = { workspace = true } uuid = { workspace = true } walkdir = { workspace = true } -[lib] -doctest = false +[lints.clippy] +pedantic = { level = "warn", priority = -1 } +todo = "warn" +unwrap_used = "warn" diff --git a/crates/lanspread-peer/src/context.rs b/crates/lanspread-peer/src/context.rs index 55cb9d0..a4f3da3 100644 --- a/crates/lanspread-peer/src/context.rs +++ b/crates/lanspread-peer/src/context.rs @@ -11,7 +11,6 @@ use crate::{PeerEvent, Unpacker, events, library::LocalLibraryState, peer_db::Pe /// Thread-safe map of active outbound file transfers grouped by game ID. pub type OutboundTransfers = Arc>>>; - /// Mutating filesystem operation currently in flight for a game root. #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum OperationKind { diff --git a/crates/lanspread-proto/Cargo.toml b/crates/lanspread-proto/Cargo.toml index 2b1cf57..6dd85df 100644 --- a/crates/lanspread-proto/Cargo.toml +++ b/crates/lanspread-proto/Cargo.toml @@ -3,13 +3,9 @@ name = "lanspread-proto" version = "0.1.0" edition = "2024" -[lints.rust] -unsafe_code = "forbid" - -[lints.clippy] -pedantic = { level = "warn", priority = -1 } -todo = "warn" -unwrap_used = "warn" +[lib] +doctest = false +test = false [dependencies] # local @@ -21,6 +17,10 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } -[lib] -test = false -doctest = false +[lints.clippy] +pedantic = { level = "warn", priority = -1 } +todo = "warn" +unwrap_used = "warn" + +[lints.rust] +unsafe_code = "forbid" diff --git a/crates/lanspread-tauri-deno-ts/src-tauri/Cargo.toml b/crates/lanspread-tauri-deno-ts/src-tauri/Cargo.toml index 5ec4eba..08497d1 100644 --- a/crates/lanspread-tauri-deno-ts/src-tauri/Cargo.toml +++ b/crates/lanspread-tauri-deno-ts/src-tauri/Cargo.toml @@ -8,28 +8,19 @@ edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [lib] +crate-type = ["cdylib", "rlib", "staticlib"] +doctest = false # The `_lib` suffix may seem redundant but it is necessary # to make the lib name unique and wouldn't conflict with the bin name. # This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519 name = "lanspread_tauri_deno_ts_lib" -crate-type = ["staticlib", "cdylib", "rlib"] test = true -doctest = false - -[lints.clippy] -pedantic = { level = "warn", priority = -1 } -todo = "warn" -unwrap_used = "warn" -needless_pass_by_value = "allow" - -[build-dependencies] -tauri-build = { version = "2", features = [] } [dependencies] +lanspread-compat = { path = "../../lanspread-compat" } +lanspread-db = { path = "../../lanspread-db" } # local lanspread-peer = { path = "../../lanspread-peer" } -lanspread-db = { path = "../../lanspread-db" } -lanspread-compat = { path = "../../lanspread-compat" } # external base64 = { workspace = true } @@ -39,13 +30,22 @@ mimalloc = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } tauri = { workspace = true } +tauri-plugin-dialog = { workspace = true } tauri-plugin-log = { workspace = true } tauri-plugin-shell = { workspace = true } -tauri-plugin-dialog = { workspace = true } tauri-plugin-store = { workspace = true } tokio = { workspace = true } tokio-util = { workspace = true } walkdir = { workspace = true } +[build-dependencies] +tauri-build = { version = "2", features = [] } + [target.'cfg(windows)'.dependencies] windows = { workspace = true } + +[lints.clippy] +needless_pass_by_value = "allow" +pedantic = { level = "warn", priority = -1 } +todo = "warn" +unwrap_used = "warn" diff --git a/crates/lanspread-utils/Cargo.toml b/crates/lanspread-utils/Cargo.toml index 6e1a37a..63325cb 100644 --- a/crates/lanspread-utils/Cargo.toml +++ b/crates/lanspread-utils/Cargo.toml @@ -3,14 +3,14 @@ name = "lanspread-utils" version = "0.1.0" edition = "2024" -[lints.rust] -unsafe_code = "forbid" +[lib] +doctest = false +test = false [lints.clippy] pedantic = { level = "warn", priority = -1 } todo = "warn" unwrap_used = "warn" -[lib] -test = false -doctest = false +[lints.rust] +unsafe_code = "forbid" diff --git a/justfile b/justfile index 36e7a84..23e42b1 100644 --- a/justfile +++ b/justfile @@ -13,6 +13,7 @@ bundle: fmt: cargo +nightly fmt + tombi format just --fmt _fix: diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 282cfda..976d17a 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -1,4 +1,3 @@ - # cargo-vet audits file [[audits.windows-link]] diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 2cc516a..ec7277c 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -1,4 +1,3 @@ - # cargo-vet config file [cargo-vet]