Skip to content

update & run cargo-sort #3269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GuillaumeGomez merged 1 commit into from
Mar 25, 2026
+6 −9
Merged

update & run cargo-sort #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion crates/bin/docs_rs_web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 1 addition & 5 deletions crates/lib/docs_rs_database/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions justfiles/testing.just
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading