From dfd7b08cb119b2e9dbea336274efc39fb792cd9a Mon Sep 17 00:00:00 2001 From: Denis Cornehl Date: Wed, 25 Mar 2026 09:43:44 +0100 Subject: [PATCH] update & run cargo-sort --- .github/workflows/ci.yml | 2 +- crates/bin/docs_rs_web/Cargo.toml | 3 ++- crates/lib/docs_rs_database/Cargo.toml | 6 +----- justfiles/testing.just | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e0992ddd..7bdd20d20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,7 @@ jobs: - uses: taiki-e/install-action@v2 with: - tool: just,fd-find,cargo-machete,cargo-udeps,cargo-sort@2.1.0 + tool: just,fd-find,cargo-machete,cargo-udeps,cargo-sort@2.1.3 - name: restore build & cargo cache uses: Swatinem/rust-cache@v2 diff --git a/crates/bin/docs_rs_web/Cargo.toml b/crates/bin/docs_rs_web/Cargo.toml index 8f041ac85..49e169eaa 100644 --- a/crates/bin/docs_rs_web/Cargo.toml +++ b/crates/bin/docs_rs_web/Cargo.toml @@ -10,7 +10,8 @@ build = "build.rs" [package.metadata.cargo-machete] ignored = [ # used in build script output - "slug", # used in askama templates, can be moved to web binary + # used in askama templates, can be moved to web binary + "slug", ] [dependencies] diff --git a/crates/lib/docs_rs_database/Cargo.toml b/crates/lib/docs_rs_database/Cargo.toml index 4cd5471b7..3076eeab0 100644 --- a/crates/lib/docs_rs_database/Cargo.toml +++ b/crates/lib/docs_rs_database/Cargo.toml @@ -6,11 +6,7 @@ edition.workspace = true build = "build.rs" [features] -testing = [ - "dep:rand", - "docs_rs_config/testing", - "docs_rs_opentelemetry/testing", -] +testing = ["dep:rand", "docs_rs_config/testing", "docs_rs_opentelemetry/testing"] [dependencies] anyhow = { workspace = true } diff --git a/justfiles/testing.just b/justfiles/testing.just index 5f1b7548e..efc5c434e 100644 --- a/justfiles/testing.just +++ b/justfiles/testing.just @@ -99,8 +99,8 @@ sort-cargo-toml *args: #!/usr/bin/env bash set -euo pipefail - if [ {{semver_matches(trim_start_match(shell("cargo-sort --version"), "cargo-sort "), ">=2.1.0")}} != 'true' ]; then - echo "cargo-sort to old, must be >=2.1.0" + if [ {{semver_matches(trim_start_match(shell("cargo-sort --version"), "cargo-sort "), ">=2.1.3")}} != 'true' ]; then + echo "cargo-sort to old, must be >=2.1.3" exit 1; fi