Skip to content

Commit 5dcfd3e

Browse files
Format TOML files (#166)
2 parents e2aa23a + e39ed09 commit 5dcfd3e

5 files changed

Lines changed: 31 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
with:
6161
command: test
6262

63-
fmt:
64-
name: Rustfmt
63+
fmt-rust:
64+
name: Format Rust with `cargo fmt`
6565
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
6666
runs-on: ubuntu-latest
6767
strategy:
@@ -85,6 +85,19 @@ jobs:
8585
command: fmt
8686
args: --all -- --check
8787

88+
fmt-toml:
89+
name: Format TOML with Taplo
90+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
91+
runs-on: ubuntu-latest
92+
steps:
93+
- name: Install Taplo
94+
uses: uncenter/setup-taplo@v1
95+
with:
96+
version: "0.9.3"
97+
98+
- name: Run `taplo fmt`
99+
run: taplo format --check --diff
100+
88101
clippy:
89102
name: Clippy
90103
needs: [check]

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
[workspace]
2-
members = [
3-
"moz-webgpu-cts",
4-
"whippit",
5-
]
2+
members = ["moz-webgpu-cts", "whippit"]
63
resolver = "2"
74

85
[workspace.dependencies]

deny.toml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
[licenses]
2-
allow = [
3-
"Apache-2.0",
4-
"ISC",
5-
"MIT",
6-
"Unicode-DFS-2016",
7-
"Zlib",
8-
]
2+
allow = ["Apache-2.0", "ISC", "MIT", "Unicode-DFS-2016", "Zlib"]
93

104
[sources]
115
allow-git = [
12-
"https://github.com/ErichDonGubler/tardar",
13-
"https://github.com/ErichDonGubler/wax",
6+
"https://github.com/ErichDonGubler/tardar",
7+
"https://github.com/ErichDonGubler/wax",
148
]

dist-workspace.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ ci = "github"
1010
# The installers to generate for each app
1111
installers = ["shell", "powershell", "msi"]
1212
# Target platforms to build apps for (Rust target-triple syntax)
13-
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
13+
targets = [
14+
"aarch64-apple-darwin",
15+
"x86_64-apple-darwin",
16+
"x86_64-unknown-linux-gnu",
17+
"x86_64-pc-windows-msvc",
18+
]
1419
# Which actions to run on pull requests
1520
pr-run-mode = "plan"
1621
# Whether to install an updater program

moz-webgpu-cts/Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ serde = { workspace = true, features = ["derive"] }
3636
serde_json = "1.0.107"
3737
strum = { version = "0.25.0", features = ["derive"] }
3838
thiserror = { workspace = true }
39-
wax = { version = "0.6.0", features = ["miette"], git = "https://github.com/ErichDonGubler/wax", branch = "static-miette-diags"}
40-
whippit = { version = "0.6.2", path = "../whippit", default-features = false, features = ["serde1"] }
39+
wax = { version = "0.6.0", features = [
40+
"miette",
41+
], git = "https://github.com/ErichDonGubler/wax", branch = "static-miette-diags" }
42+
whippit = { version = "0.6.2", path = "../whippit", default-features = false, features = [
43+
"serde1",
44+
] }
4145
enum-map = { version = "2.7.3", features = ["serde"] }
4246

4347
[dev-dependencies]

0 commit comments

Comments
 (0)