ci: sort elements in Cargo.toml

Kijewski · Aug 13, 2024 · 90096ef · 90096ef
1 parent d5a4f9c
commit 90096ef
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 15 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -70,7 +70,7 @@ jobs:
             cd "$PKG"
             echo "Testing: $PKG"
             cargo fmt -- --check
-            cd -
+            cd - > /dev/null
           done
 
   MSRV:
@@ -114,3 +114,22 @@ jobs:
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: devskim-results.sarif
+
+  CargoSort:
+    name: Check order in Cargo.toml
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-sort
+      - run: |
+          set -eu
+          for PKG in \
+            rinja rinja_actix rinja_axum rinja_derive rinja_derive_standalone \
+            rinja_parser rinja_rocket rinja_warp testing
+          do
+            cd "$PKG"
+            cargo sort --check --check-format --grouped
+            cd - > /dev/null
+          done
diff --git a/rinja/Cargo.toml b/rinja/Cargo.toml
@@ -13,6 +13,10 @@ readme = "../README.md"
 edition = "2021"
 rust-version = "1.71"
 
+[package.metadata.docs.rs]
+features = ["default", "serde_json"]
+rustdoc-args = ["--generate-link-to-definition", "--cfg=docsrs"]
+
 [badges]
 maintenance = { status = "actively-developed" }
 
@@ -34,14 +38,14 @@ with-warp = ["rinja_derive/with-warp"]
 [dependencies]
 rinja_derive = { version = "=0.3.0", path = "../rinja_derive" }
 
-itoa = "1.0.11"
-
 humansize = { version = "2", optional = true }
 num-traits = { version = "0.2.6", optional = true }
 percent-encoding = { version = "2.1.0", optional = true }
 serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0", optional = true }
 
+itoa = "1.0.11"
+
 [dev-dependencies]
 criterion = "0.5"
 
@@ -53,7 +57,3 @@ required-features = ["serde_json"]
 [[bench]]
 name = "escape"
 harness = false
-
-[package.metadata.docs.rs]
-features = ["default", "serde_json"]
-rustdoc-args = ["--generate-link-to-definition", "--cfg=docsrs"]
diff --git a/rinja_actix/Cargo.toml b/rinja_actix/Cargo.toml
@@ -14,6 +14,7 @@ rust-version = "1.71"
 
 [dependencies]
 rinja = { version = "0.3.0", path = "../rinja", default-features = false, features = ["with-actix-web"] }
+
 actix-web = { version = "4", default-features = false }
 
 [dev-dependencies]

diff --git a/rinja_axum/Cargo.toml b/rinja_axum/Cargo.toml
@@ -14,6 +14,7 @@ readme = "README.md"
 
 [dependencies]
 rinja = { version = "0.3.0", path = "../rinja", default-features = false, features = ["with-axum"] }
+
 axum-core = "0.4"
 http = "1.0"
 

diff --git a/rinja_derive/Cargo.toml b/rinja_derive/Cargo.toml
@@ -28,19 +28,20 @@ with-warp = []
 parser = { package = "rinja_parser", version = "=0.3.0", path = "../rinja_parser" }
 
 basic-toml = { version = "0.1.1", optional = true }
+serde = { version = "1.0", optional = true, features = ["derive"] }
+
 memchr = "2"
 mime = "0.3"
 mime_guess = "2"
 once_map = "0.4.18"
 proc-macro2 = "1"
 quote = "1"
-serde = { version = "1.0", optional = true, features = ["derive"] }
 syn = "2.0.3"
 
 [dev-dependencies]
 console = "0.15.8"
-similar = "2.6.0"
 prettyplease = "0.2.20"
+similar = "2.6.0"
 syn = { version = "2.0.3", features = ["full"] }
 
 [lints.rust]

diff --git a/rinja_derive_standalone/Cargo.toml b/rinja_derive_standalone/Cargo.toml
@@ -27,21 +27,21 @@ with-warp = []
 parser = { package = "rinja_parser", version = "=0.3.0", path = "../rinja_parser" }
 
 basic-toml = { version = "0.1.1", optional = true }
+serde = { version = "1.0", optional = true, features = ["derive"] }
+
 memchr = "2"
 mime = "0.3"
 mime_guess = "2"
 once_map = "0.4.18"
 proc-macro2 = "1"
 quote = "1"
-serde = { version = "1.0", optional = true, features = ["derive"] }
 syn = "2"
 
 [dev-dependencies]
-criterion = "0.5"
-
 console = "0.15.8"
-similar = "2.6.0"
+criterion = "0.5"
 prettyplease = "0.2.20"
+similar = "2.6.0"
 syn = { version = "2.0.3", features = ["full"] }
 
 [[bench]]

diff --git a/rinja_rocket/Cargo.toml b/rinja_rocket/Cargo.toml
@@ -14,6 +14,7 @@ rust-version = "1.71"
 
 [dependencies]
 rinja = { version = "0.3.0", path = "../rinja", default-features = false, features = ["with-rocket"] }
+
 rocket = { version = "0.5", default-features = false }
 
 [dev-dependencies]

diff --git a/rinja_warp/Cargo.toml b/rinja_warp/Cargo.toml
@@ -14,6 +14,7 @@ rust-version = "1.71"
 
 [dependencies]
 rinja = { version = "0.3.0", path = "../rinja", default-features = false, features = ["with-warp"] }
+
 warp = { version = "0.3", default-features = false }
 
 [dev-dependencies]

diff --git a/testing/Cargo.toml b/testing/Cargo.toml
@@ -13,12 +13,14 @@ serde_json = ["dep:serde_json", "rinja/serde_json"]
 
 [dependencies]
 rinja = { path = "../rinja", version = "0.3.0" }
+
 serde_json = { version = "1.0", optional = true }
 
 [dev-dependencies]
 rinja = { path = "../rinja", version = "0.3.0", features = ["serde_json"] }
+
 criterion = "0.5"
-phf = { version = "0.11", features = ["macros" ]}
+phf = { version = "0.11", features = ["macros" ] }
 trybuild = "1.0.76"
 
 [[bench]]

diff --git a/testing/tests/filter_block.rs b/testing/tests/filter_block.rs
@@ -233,7 +233,7 @@ fn filter_block_include() {
     <body class=""><h1>Metadata</h1>
         
 
-    99</body>
+    100</body>
 </html>"#
     );
 }

diff --git a/tomlfmt.toml b/tomlfmt.toml
@@ -0,0 +1 @@
+table_order = ["workspace", "package", "badges", "lib", "features", "dependencies", "build-dependencies", "dev-dependencies", "bench"]