diff --git a/.github/workflows/check-generic.yml b/.github/workflows/check-generic.yml index 1953ccedf4..25fc4ad8ef 100644 --- a/.github/workflows/check-generic.yml +++ b/.github/workflows/check-generic.yml @@ -20,8 +20,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: taiki-e/install-action@fd2f5e3d644b484055ebf4268f474c565f148f25 # v2.81.9 + - uses: taiki-e/install-action@b6ff580856c41316412a0b9b60540fbc6f8c82cc # v2.86.7 with: - tool: tombi + tool: tombi@1.4.1 - run: tombi lint - run: tombi fmt --check diff --git a/Cargo.toml b/Cargo.toml index ce90524457..1377c4b047 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,9 +42,7 @@ async-stripe = { version = "0.41.0", default-features = false, features = [ "runtime-tokio-hyper-rustls", ] } async-trait = "0.1.89" -async-tungstenite = { version = "0.31.0", default-features = false, features = [ - "futures-03-sink" -] } +async-tungstenite = { version = "0.31.0", default-features = false, features = ["futures-03-sink"] } async-walkdir = "2.1.0" async_zip = "0.0.18" aws-sdk-s3 = { version = "=1.122.0", default-features = false, features = [ @@ -61,9 +59,7 @@ censor = "0.3.0" chardetng = "0.1.17" chrono = "0.4.42" chumsky = "0.9.3" -cidre = { version = "0.15.0", default-features = false, features = [ - "macos_15_0" -] } +cidre = { version = "0.15.0", default-features = false, features = ["macos_15_0"] } clap = "4.5.48" clickhouse = "0.14.0" color-eyre = "0.6.5" @@ -163,10 +159,7 @@ redis = "1.4.1" regex = "1.12.2" reqwest = { version = "0.12.24", default-features = false } rgb = "0.8.52" -rust_decimal = { version = "1.39.0", features = [ - "serde-with-float", - "serde-with-str" -] } +rust_decimal = { version = "1.39.0", features = ["serde-with-float", "serde-with-str"] } rust_iso3166 = "0.1.14" rust-s3 = { version = "0.37.0", default-features = false, features = [ "fail-on-err", diff --git a/_typos.toml b/_typos.toml index ba4941b35a..944064d355 100644 --- a/_typos.toml +++ b/_typos.toml @@ -6,11 +6,16 @@ extend-exclude = [ "packages/utils/", "packages/ui/", "packages/blog/", - # contains licenses like `CC-BY-ND-4.0` - "packages/moderation/src/data/stages/license.ts", - "packages/moderation/src/utils.ts", - # contains payment card IDs like `IY1VMST1MOXS` which are flagged - "apps/labrinth/src/queue/payouts/mod.rs", +] + +[default] +extend-ignore-re = [ + # Ignore lines that end with `// typos:ignore` + "(?Rm)^.*(#|//)\\s*typos:ignore$", + # Ignore the line after `// typos:ignore`: + "(#|//)\\s*typos:ignore\\n.*", + # Ignore blocks between `// typos:off` and `// typos:on` + "(?s)(#|//)\\s*typos:off.*?\\n\\s*(#|//)\\s*typos:on", ] [default.extend-words] diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml index 6c3ab65446..03eb3ecae6 100644 --- a/apps/labrinth/Cargo.toml +++ b/apps/labrinth/Cargo.toml @@ -22,12 +22,7 @@ arc-swap = { workspace = true } argon2 = { workspace = true } ariadne = { workspace = true } async-minecraft-ping = { workspace = true, features = ["srv"] } -async-stripe = { workspace = true, features = [ - "billing", - "checkout", - "connect", - "webhook-events" -] } +async-stripe = { workspace = true, features = ["billing", "checkout", "connect", "webhook-events"] } async-trait = { workspace = true } aws-sdk-s3 = { workspace = true } base64 = { workspace = true } @@ -87,24 +82,10 @@ quick-xml = { workspace = true } rand = { workspace = true } rand_chacha = { workspace = true } rdkafka = { workspace = true } -redis = { workspace = true, features = [ - "ahash", - "cluster", - "cluster-async", - "r2d2", - "tokio-comp" -] } +redis = { workspace = true, features = ["ahash", "cluster", "cluster-async", "r2d2", "tokio-comp"] } regex = { workspace = true } -reqwest = { workspace = true, features = [ - "http2", - "json", - "multipart", - "rustls-tls-webpki-roots" -] } -rust_decimal = { workspace = true, features = [ - "serde-with-float", - "serde-with-str" -] } +reqwest = { workspace = true, features = ["http2", "json", "multipart", "rustls-tls-webpki-roots"] } +rust_decimal = { workspace = true, features = ["serde-with-float", "serde-with-str"] } rust_iso3166 = { workspace = true } rustls.workspace = true rusty-money = { workspace = true } @@ -141,10 +122,7 @@ urlencoding = { workspace = true } utoipa = { workspace = true, features = ["url"] } uuid = { workspace = true, features = ["fast-rng", "serde", "v4", "v7"] } validator = { workspace = true, features = ["derive"] } -webauthn-rs = { workspace = true, features = [ - "conditional-ui", - "danger-allow-state-serialisation" -] } +webauthn-rs = { workspace = true, features = ["conditional-ui", "danger-allow-state-serialisation"] } webauthn-rs-proto = { workspace = true } webp = { workspace = true } woothee = { workspace = true } diff --git a/apps/labrinth/src/queue/payouts/mod.rs b/apps/labrinth/src/queue/payouts/mod.rs index cdc5b34cdd..bcf168b231 100644 --- a/apps/labrinth/src/queue/payouts/mod.rs +++ b/apps/labrinth/src/queue/payouts/mod.rs @@ -724,6 +724,7 @@ async fn get_tremendous_payout_methods( for product in response.products { const BLACKLISTED_IDS: &[&str] = &[ + // typos:off // physical visa "A2J05SWPI2QG", // crypto @@ -756,6 +757,7 @@ async fn get_tremendous_payout_methods( "NL4JQ2G7UPRZ", "OEFTMSBA5ELH", "A3CQK6UHNV27", + // typos:on ]; const SUPPORTED_METHODS: &[&str] = &[ "merchant_cards", diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml index fb5f6e5083..a3a06a0e15 100644 --- a/packages/app-lib/Cargo.toml +++ b/packages/app-lib/Cargo.toml @@ -9,10 +9,7 @@ ariadne = { workspace = true } async-minecraft-ping = { workspace = true, features = ["srv"] } async-recursion = { workspace = true } async-trait = { workspace = true } -async-tungstenite = { workspace = true, features = [ - "tokio-runtime", - "tokio-rustls-webpki-roots" -] } +async-tungstenite = { workspace = true, features = ["tokio-runtime", "tokio-rustls-webpki-roots"] } async-walkdir = { workspace = true } async_zip = { workspace = true, features = [ "bzip2", @@ -113,11 +110,7 @@ toml = { workspace = true } tracing = { workspace = true } tracing-error = { workspace = true } tracing-subscriber = { workspace = true, features = ["chrono", "env-filter"] } -ts-rs = { workspace = true, features = [ - "chrono-impl", - "no-serde-warnings", - "uuid-impl" -], optional = true } +ts-rs = { workspace = true, features = ["chrono-impl", "no-serde-warnings", "uuid-impl"], optional = true } url = { workspace = true, features = ["serde"] } urlencoding = { workspace = true } uuid = { workspace = true, features = ["serde", "v4"] } diff --git a/packages/moderation/src/utils.ts b/packages/moderation/src/utils.ts index fbeb54313b..c9711596af 100644 --- a/packages/moderation/src/utils.ts +++ b/packages/moderation/src/utils.ts @@ -19,6 +19,7 @@ export function expandVariables( } export const licensesNotRequiringSource: string[] = [ + // typos:off 'LicenseRef-All-Rights-Reserved', 'Apache-2.0', 'BSD-2-Clause', @@ -33,6 +34,7 @@ export const licensesNotRequiringSource: string[] = [ 'ISC', 'MIT', 'Zlib', + // typos:on ] export const licensesRequiringSource: string[] = [ diff --git a/packages/sqlx-tracing/Cargo.toml b/packages/sqlx-tracing/Cargo.toml index bf89e32aa8..3ce51c659a 100644 --- a/packages/sqlx-tracing/Cargo.toml +++ b/packages/sqlx-tracing/Cargo.toml @@ -10,12 +10,7 @@ repository = "https://github.com/jdrouet/sqlx-tracing" license = "MIT" # authors = ["Jérémie Drouet "] # deprecated field, Tombi warns keywords = ["database", "observability", "opentelemetry", "sqlx", "tracing"] -categories = [ - "asynchronous", - "database", - "development-tools::debugging", - "development-tools::profiling" -] +categories = ["asynchronous", "database", "development-tools::debugging", "development-tools::profiling"] [dependencies] derive_more = { workspace = true, features = ["deref", "deref_mut"] } diff --git a/packages/xredis/Cargo.toml b/packages/xredis/Cargo.toml index cc87779098..14a698c047 100644 --- a/packages/xredis/Cargo.toml +++ b/packages/xredis/Cargo.toml @@ -15,12 +15,7 @@ futures = { workspace = true } lz4_flex = { workspace = true } postcard = { workspace = true } prometheus = { workspace = true } -redis = { workspace = true, features = [ - "ahash", - "cluster", - "cluster-async", - "tokio-comp" -] } +redis = { workspace = true, features = ["ahash", "cluster", "cluster-async", "tokio-comp"] } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } tokio = { workspace = true, features = ["rt", "sync", "time"] }