Switch to Tombi for TOML formatting

.cargo/config_fast_builds.toml

@@ -8,7 +8,7 @@
 # ## LLD
 #
 # LLD is a linker from the LLVM project that supports Linux, Windows, macOS, and Wasm. It has the greatest
-# platform support and the easiest installation process. It is enabled by default in this file for Windows. 
+# platform support and the easiest installation process. It is enabled by default in this file for Windows.
 # LLD is the default linker in Rust itself for Linux, so no configuration is needed.
 # On macOS, the default linker yields higher performance than LLD and is used instead.
 #
@@ -23,7 +23,7 @@
 # through its high parallelism, though it only supports Linux.
 #
 # Mold is disabled by default in this file. If you wish to enable it, follow the installation instructions for
-# your corresponding target, disable LLD by commenting out its `-Clink-arg=...` line (not applicable for Linux anymore), 
+# your corresponding target, disable LLD by commenting out its `-Clink-arg=...` line (not applicable for Linux anymore),
 # and enable Mold by *uncommenting* its `-Clink-arg=...` line.
 #
 # There is a fork of Mold named Sold that supports macOS, but it is unmaintained and is about the same speed as

.config/tombi.toml

@@ -0,0 +1,35 @@
+toml-version = "v1.1.0"
+
+[format.rules]
+trailing-comment-alignment = true
+trailing-comment-space-width = 1
+
+[lint.rules]
+tables-out-of-order = "off"
+
+[schema]
+enabled = true
+strict = false                                           # allow additional properties
+catalog = {
+  paths = [
+    "https://www.schemastore.org/api/json/catalog.json",
+  ],
+}
+
+[[schemas]]
+toml-version = "v1.1.0"
+path = "https://www.schemastore.org/cargo.json"
+include = ["Cargo.toml"]
+format.rules = {
+  array-values-order.enabled = false,
+  table-keys-order.enabled = false
+}
+
+[[schemas]]
+toml-version = "v1.0.0"
+path = "https://catalog.lintel.tools/schemas/rust/clippy/latest.json"
+include = ["clippy.toml"]
+format.rules = {
+  array-values-order.enabled = false,
+  table-keys-order.enabled = false
+}

.github/workflows/ci.yml

@@ -352,19 +352,21 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Install taplo
-        run: curl -fsSL https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-linux-x86_64.gz | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
-      - name: Run Taplo
-        id: taplo
-        run: taplo fmt --check --diff
-      - name: Taplo info
+      - uses: tombi-toml/setup-tombi@9880d1d3ba5e745d410c697366c513b337704388 # v1.0.11
+        with:
+          version: '0.11.6'
+          checksum: 'c08823c7be08c3a30454035432ab8614bfe560f9d80123325cf0d4909c58c9b5'
+      - name: Run Tombi
+        id: tombi
+        run: tombi format --check --diff
+      - name: Tombi info
         if: failure()
         run: |
-          echo 'To fix toml fmt, please run `taplo fmt`.'
-          echo 'To check for a diff, run `taplo fmt --check --diff`.'
-          echo 'You can find taplo here: https://taplo.tamasfe.dev/'
-          echo 'Or if you use VSCode, use the `Even Better Toml` extension.'
-          echo 'You can find the extension here: https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml'
+          echo 'To fix toml formatting, please run `tombi format`.'
+          echo 'To check for a diff, run `tombi format --check --diff`.'
+          echo 'You can find Tombi here: https://tombi-toml.github.io/tombi/'
+          echo 'Or if you use VS Code, use the `Tombi` extension.'
+          echo 'You can find the extension here: https://marketplace.visualstudio.com/items?itemName=tombi-toml.tombi'
 
   typos:
     runs-on: ubuntu-latest

Cargo.toml

@@ -80,7 +80,7 @@ allow_attributes_without_reason = "warn"
 
 [workspace.lints.rust]
 missing_docs = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(docsrs_dep)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(docsrs_dep)"] }
 unsafe_code = "deny"
 unsafe_op_in_unsafe_fn = "warn"
 unused_qualifications = "warn"
@@ -125,7 +125,7 @@ allow_attributes_without_reason = "warn"
 
 [lints.rust]
 missing_docs = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(docsrs_dep)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(docsrs_dep)"] }
 unsafe_code = "deny"
 unsafe_op_in_unsafe_fn = "warn"
 unused_qualifications = "warn"
@@ -729,12 +729,21 @@ hotpatching = ["bevy_internal/hotpatching"]
 debug = ["bevy_internal/debug"]
 
 [dependencies]
-bevy_internal = { path = "crates/bevy_internal", version = "0.19.0-dev", default-features = false }
+bevy_internal = {
+  path = "crates/bevy_internal",
+  version = "0.19.0-dev",
+  default-features = false
+}
 tracing = { version = "0.1", default-features = false, optional = true }
 
 # Wasm does not support dynamic linking.
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-bevy_dylib = { path = "crates/bevy_dylib", version = "0.19.0-dev", default-features = false, optional = true }
+bevy_dylib = {
+  path = "crates/bevy_dylib",
+  version = "0.19.0-dev",
+  default-features = false,
+  optional = true
+}
 
 [dev-dependencies]
 rand = "0.10.0"
@@ -745,16 +754,56 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1.0.140"
 bytemuck = "1"
 # The following explicit dependencies are needed for proc macros to work inside of examples as they are part of the bevy crate itself.
-bevy_animation = { path = "crates/bevy_animation", version = "0.19.0-dev", default-features = false }
-bevy_asset = { path = "crates/bevy_asset", version = "0.19.0-dev", default-features = false }
-bevy_ecs = { path = "crates/bevy_ecs", version = "0.19.0-dev", default-features = false }
-bevy_gizmos = { path = "crates/bevy_gizmos", version = "0.19.0-dev", default-features = false }
-bevy_image = { path = "crates/bevy_image", version = "0.19.0-dev", default-features = false }
-bevy_reflect = { path = "crates/bevy_reflect", version = "0.19.0-dev", default-features = false }
-bevy_render = { path = "crates/bevy_render", version = "0.19.0-dev", default-features = false }
-bevy-settings = { path = "crates/bevy_settings", version = "0.19.0-dev", default-features = false }
-bevy_state = { path = "crates/bevy_state", version = "0.19.0-dev", default-features = false }
-bevy_scene = { path = "crates/bevy_scene", version = "0.19.0-dev", default-features = false }
+bevy_animation = {
+  path = "crates/bevy_animation",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_asset = {
+  path = "crates/bevy_asset",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_ecs = {
+  path = "crates/bevy_ecs",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_gizmos = {
+  path = "crates/bevy_gizmos",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_image = {
+  path = "crates/bevy_image",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_reflect = {
+  path = "crates/bevy_reflect",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_render = {
+  path = "crates/bevy_render",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy-settings = {
+  path = "crates/bevy_settings",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_state = {
+  path = "crates/bevy_state",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_scene = {
+  path = "crates/bevy_scene",
+  version = "0.19.0-dev",
+  default-features = false
+}
 # Needed to poll Task examples
 futures-lite = "2.0.1"
 futures-timer = { version = "3", features = ["wasm-bindgen", "gloo-timers"] }
@@ -772,9 +821,13 @@ indexmap = "2"
 ureq = { version = "3.0.8", features = ["json"] }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-getrandom = { version = "0.4", default-features = false, features = [
-  "wasm_js",
-] }
+getrandom = {
+  version = "0.4",
+  default-features = false,
+  features = [
+    "wasm_js",
+  ]
+}
 wasm-bindgen = { version = "0.2" }
 web-sys = { version = "0.3", features = ["Window"] }
 
@@ -2423,7 +2476,6 @@ description = "Demonstrates how to add custom schedules"
 category = "ECS (Entity Component System)"
 wasm = false
 
-
 [[example]]
 name = "extraction"
 path = "examples/ecs/extraction.rs"
@@ -2772,7 +2824,6 @@ description = "Illustrates ticking `Timer` resources inside systems and handling
 category = "Time"
 wasm = false
 
-
 # Games
 [[example]]
 name = "alien_cake_addict"
@@ -4587,7 +4638,6 @@ description = "Example demonstrating how to debug frustum culling"
 category = "Usage"
 wasm = true
 
-
 [[example]]
 name = "custom_gltf_vertex_attribute"
 path = "examples/gltf/custom_gltf_vertex_attribute.rs"

benches/Cargo.toml

@@ -28,15 +28,23 @@ bevy_scene = { path = "../crates/bevy_scene" }
 bevy_tasks = { path = "../crates/bevy_tasks" }
 bevy_transform = { path = "../crates/bevy_transform" }
 bevy_ui = { path = "../crates/bevy_ui" }
-bevy_platform = { path = "../crates/bevy_platform", default-features = false, features = [
-  "std",
-] }
+bevy_platform = {
+  path = "../crates/bevy_platform",
+  default-features = false,
+  features = [
+    "std",
+  ]
+}
 
 # Other crates
-glam = { version = "0.32.0", default-features = false, features = [
-  "std",
-  "rand",
-] }
+glam = {
+  version = "0.32.0",
+  default-features = false,
+  features = [
+    "std",
+    "rand",
+  ]
+}
 rand = "0.10"
 chacha20 = { version = "0.10.0", default-features = false, features = ["rng"] }
 nonmax = { version = "0.5", default-features = false }
@@ -66,7 +74,7 @@ allow_attributes = "warn"
 allow_attributes_without_reason = "warn"
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(docsrs_dep)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(docsrs_dep)"] }
 unsafe_op_in_unsafe_fn = "warn"
 unused_qualifications = "warn"
 

crates/bevy_a11y/Cargo.toml

@@ -40,16 +40,34 @@ critical-section = [
 
 [dependencies]
 # bevy
-bevy_app = { path = "../bevy_app", version = "0.19.0-dev", default-features = false }
+bevy_app = {
+  path = "../bevy_app",
+  version = "0.19.0-dev",
+  default-features = false
+}
 bevy_derive = { path = "../bevy_derive", version = "0.19.0-dev" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.19.0-dev", default-features = false }
-bevy_reflect = { path = "../bevy_reflect", version = "0.19.0-dev", default-features = false, optional = true }
+bevy_ecs = {
+  path = "../bevy_ecs",
+  version = "0.19.0-dev",
+  default-features = false
+}
+bevy_reflect = {
+  path = "../bevy_reflect",
+  version = "0.19.0-dev",
+  default-features = false,
+  optional = true
+}
 
 # other
 accesskit = { version = "0.24", default-features = false }
-serde = { version = "1", default-features = false, features = [
-  "alloc",
-], optional = true }
+serde = {
+  version = "1",
+  default-features = false,
+  features = [
+    "alloc",
+  ],
+  optional = true
+}
 
 [lints]
 workspace = true

crates/bevy_animation/Cargo.toml

@@ -16,20 +16,34 @@ bevy_asset = { path = "../bevy_asset", version = "0.19.0-dev" }
 bevy_color = { path = "../bevy_color", version = "0.19.0-dev" }
 bevy_derive = { path = "../bevy_derive", version = "0.19.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.19.0-dev" }
-bevy_mesh = { path = "../bevy_mesh", version = "0.19.0-dev", optional = true, features = [
-  "morph",
-] }
-bevy_reflect = { path = "../bevy_reflect", version = "0.19.0-dev", features = [
-  "petgraph",
-] }
+bevy_mesh = {
+  path = "../bevy_mesh",
+  version = "0.19.0-dev",
+  optional = true,
+  features = [
+    "morph",
+  ]
+}
+bevy_reflect = {
+  path = "../bevy_reflect",
+  version = "0.19.0-dev",
+  features = [
+    "petgraph",
+  ]
+}
 bevy_time = { path = "../bevy_time", version = "0.19.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.19.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.19.0-dev" }
 bevy_transform = { path = "../bevy_transform", version = "0.19.0-dev" }
-bevy_platform = { path = "../bevy_platform", version = "0.19.0-dev", default-features = false, features = [
-  "std",
-  "serialize",
-] }
+bevy_platform = {
+  path = "../bevy_platform",
+  version = "0.19.0-dev",
+  default-features = false,
+  features = [
+    "std",
+    "serialize",
+  ]
+}
 
 # other
 petgraph = { version = "0.8", features = ["serde-1"] }