From d22aa2eb5587df9814880ac687c8aa552a602321 Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Fri, 4 Oct 2024 10:57:23 -0400 Subject: [PATCH] chore: format TOML files with `taplo` 0.9.3 --- .deny.toml | 56 +++++++++++++++++++++---------------------- cts_runner/Cargo.toml | 4 +--- naga/xtask/Cargo.toml | 2 +- player/Cargo.toml | 11 ++++++++- rustfmt.toml | 1 + wgpu-hal/Cargo.toml | 18 ++++++++++---- xtask/Cargo.toml | 2 +- 7 files changed, 55 insertions(+), 39 deletions(-) diff --git a/.deny.toml b/.deny.toml index 718836d0e7..b657b88a4b 100644 --- a/.deny.toml +++ b/.deny.toml @@ -1,50 +1,48 @@ [bans] multiple-versions = "deny" skip-tree = [ - # We never enable loom in any of our dependencies but it causes dupes - { name = "loom", version = "0.7.2" }, - { name = "windows-sys", version = "0.45" }, - { name = "winit", version = "0.29" }, - { name = "rustc_version", version = "0.2.3" }, - { name = "sourcemap", version = "7.1.1" }, - { name = "miniz_oxide", version = "0.7.4" }, + # We never enable loom in any of our dependencies but it causes dupes + { name = "loom", version = "0.7.2" }, + { name = "windows-sys", version = "0.45" }, + { name = "winit", version = "0.29" }, + { name = "rustc_version", version = "0.2.3" }, + { name = "sourcemap", version = "7.1.1" }, + { name = "miniz_oxide", version = "0.7.4" }, ] skip = [ - { name = "hlsl-snapshots", version = "0.1.0" }, - # Strum uses an old version - { name = "heck", version = "0.4.0" }, + { name = "hlsl-snapshots", version = "0.1.0" }, + # Strum uses an old version + { name = "heck", version = "0.4.0" }, ] wildcards = "deny" allow-wildcard-paths = true [licenses] allow = [ - "Apache-2.0", - "Apache-2.0 WITH LLVM-exception", - "BSD-2-Clause", - "BSD-3-Clause", - "CC0-1.0", - "ISC", - "MPL-2.0", - "MIT", - "MIT-0", - "Unicode-DFS-2016", - "Zlib", + "Apache-2.0", + "Apache-2.0 WITH LLVM-exception", + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "ISC", + "MPL-2.0", + "MIT", + "MIT-0", + "Unicode-DFS-2016", + "Zlib", ] [sources] allow-git = [ - # Waiting on releases; used in examples only - "https://github.com/Razaekel/noise-rs", - - "https://github.com/grovesNL/glow", - "https://github.com/gfx-rs/metal-rs", + # Waiting on releases; used in examples only + "https://github.com/Razaekel/noise-rs", + + "https://github.com/grovesNL/glow", + "https://github.com/gfx-rs/metal-rs", ] unknown-registry = "deny" unknown-git = "deny" required-git-spec = "rev" [sources.allow-org] -github = [ - "gfx-rs" -] +github = ["gfx-rs"] diff --git a/cts_runner/Cargo.toml b/cts_runner/Cargo.toml index bd4df47935..0d651d17af 100644 --- a/cts_runner/Cargo.toml +++ b/cts_runner/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "cts_runner" version = "0.1.0" -authors = [ - "Luca Casonato " -] +authors = ["Luca Casonato "] edition.workspace = true description = "CTS runner for wgpu" license.workspace = true diff --git a/naga/xtask/Cargo.toml b/naga/xtask/Cargo.toml index 159e54a586..2b3f0247ac 100644 --- a/naga/xtask/Cargo.toml +++ b/naga/xtask/Cargo.toml @@ -8,7 +8,7 @@ publish = false anyhow = "1" env_logger = { version = "0.10.0", default-features = false } glob = "0.3.1" -hlsl-snapshots = { path = "../hlsl-snapshots"} +hlsl-snapshots = { path = "../hlsl-snapshots" } indicatif = "0.17" jobserver = "0.1" log = "0.4.17" diff --git a/player/Cargo.toml b/player/Cargo.toml index 6c391cb4d6..3aa4c3f5a8 100644 --- a/player/Cargo.toml +++ b/player/Cargo.toml @@ -33,7 +33,16 @@ features = ["serde"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc] workspace = true -features = ["replay", "raw-window-handle", "strict_asserts", "wgsl", "metal", "dx12", "vulkan", "gles"] +features = [ + "replay", + "raw-window-handle", + "strict_asserts", + "wgsl", + "metal", + "dx12", + "vulkan", + "gles", +] [dev-dependencies] serde.workspace = true diff --git a/rustfmt.toml b/rustfmt.toml index e69de29bb2..8b13789179 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -0,0 +1 @@ + diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 03af10b96e..418bd5cee1 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -205,11 +205,21 @@ features = ["wgsl-in"] [dev-dependencies] cfg-if.workspace = true env_logger.workspace = true -glam.workspace = true # for ray-traced-triangle example -winit.workspace = true # for "halmark" example +glam.workspace = true # for ray-traced-triangle example +winit.workspace = true # for "halmark" example [target.'cfg(not(any(target_arch = "wasm32", target_os = "ios")))'.dev-dependencies] -glutin-winit = { workspace = true, features = ["egl", "wgl", "wayland", "x11"] } # for "raw-gles" example -glutin = { workspace = true, features = ["egl", "wgl", "wayland", "x11"] } # for "raw-gles" example +glutin-winit = { workspace = true, features = [ + "egl", + "wgl", + "wayland", + "x11", +] } # for "raw-gles" example +glutin = { workspace = true, features = [ + "egl", + "wgl", + "wayland", + "x11", +] } # for "raw-gles" example rwh_05 = { version = "0.5", package = "raw-window-handle" } # temporary compatibility for glutin-winit in "raw-gles" example winit = { workspace = true, features = ["rwh_05"] } # for "raw-gles" example diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index b608e4f80f..502a596557 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -8,7 +8,7 @@ publish = false # The dependencies in this config have no transitive dependencies. anyhow = "1.0.71" env_logger = { version = "0.10.0", default-features = false } -regex-lite = "0.1.5" +regex-lite = "0.1.5" log = "0.4.18" pico-args = { version = "0.5.0", features = [ "eq-separator",