Skip to content

Commit 04b0977

Browse files
committed
chore: fd --glob *.toml -X taplo fmt
1 parent 249216b commit 04b0977

File tree

6 files changed

+61
-49
lines changed

6 files changed

+61
-49
lines changed

Cargo.toml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
[workspace]
2-
members = ["e2e-identity", "jwt", "ffi", "acme", "x509-check", "test-wire-server"]
2+
members = [
3+
"e2e-identity",
4+
"jwt",
5+
"ffi",
6+
"acme",
7+
"x509-check",
8+
"test-wire-server",
9+
]
310
resolver = "2"
411

512
[workspace.lints.clippy]
@@ -9,7 +16,9 @@ undocumented_unsafe_blocks = "deny"
916
[workspace.dependencies]
1017
anyhow = { version = "1.0", default-features = false }
1118
base64 = { version = "0.22", default-features = false, features = ["std"] }
12-
certval = { git = "https://github.com/wireapp/rust-pki.git", branch = "wire/stable", package = "certval", default-features = false, features = ["revocation"] }
19+
certval = { git = "https://github.com/wireapp/rust-pki.git", branch = "wire/stable", package = "certval", default-features = false, features = [
20+
"revocation",
21+
] }
1322
const-oid = { version = "0.9", default-features = false, features = ["std"] }
1423
const_format = { version = "0.2", default-features = false }
1524
derive_more = { version = "2.0.1", default-features = false }
@@ -20,7 +29,9 @@ flagset = { version = "0.4", default-features = false }
2029
web-time = { version = "1.1.0", default-features = false }
2130
getrandom = { version = "0.2.8", default-features = false }
2231
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
23-
itertools = { version = "0.12", default-features = false, features = ["use_alloc"] }
32+
itertools = { version = "0.12", default-features = false, features = [
33+
"use_alloc",
34+
] }
2435
lazy_static = { version = "1.4", default-features = false }
2536
p256 = { version = "0.13", default-features = false }
2637
p384 = { version = "0.13", default-features = false }
@@ -52,7 +63,9 @@ tokio = { version = "1.45", default-features = false }
5263
hyper = { version = "1.6", default-features = false }
5364
wasm-bindgen-test = { version = "0.3", default-features = false }
5465
webbrowser = { version = "0.8", default-features = false }
55-
reqwest = { version = "0.12", default-features = false, features = ["native-tls"] }
66+
reqwest = { version = "0.12", default-features = false, features = [
67+
"native-tls",
68+
] }
5669
rstest = { version = "0.19", default-features = false }
5770
rstest_reuse = { version = "0.6", default-features = false }
5871
scraper = { version = "0.23", default-features = false }

acme/Cargo.toml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ thiserror = { workspace = true }
2222
jwt-simple = { workspace = true }
2323
base64 = { workspace = true }
2424
url = { workspace = true, features = ["serde"] }
25-
time = { workspace = true, features = ["serde", "serde-well-known", "wasm-bindgen"] }
25+
time = { workspace = true, features = [
26+
"serde",
27+
"serde-well-known",
28+
"wasm-bindgen",
29+
] }
2630
x509-cert = { workspace = true }
2731
const-oid = { workspace = true }
2832
signature = { workspace = true }
@@ -37,6 +41,8 @@ web-time = { workspace = true }
3741
hex = { workspace = true }
3842

3943
[dev-dependencies]
40-
rusty-jwt-tools = { version = "0.13.0", path = "../jwt", features = ["test-utils"] }
44+
rusty-jwt-tools = { version = "0.13.0", path = "../jwt", features = [
45+
"test-utils",
46+
] }
4147
wasm-bindgen-test = { workspace = true }
4248
hex = { workspace = true }

cliff.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ tag_pattern = "v[0-9]*"
2121
date_order = true
2222
sort_commits = "newest"
2323
commit_parsers = [
24-
{ message = "^feat", group = "<!-- 0 -->Features"},
25-
{ message = "^fix", group = "<!-- 1 -->Bug Fixes"},
26-
{ message = "^doc", group = "<!-- 2 -->Documentation"},
27-
{ message = "^perf", group = "<!-- 3 -->Performance"},
28-
{ message = "^test", group = "<!-- 4 -->Testing"},
24+
{ message = "^feat", group = "<!-- 0 -->Features" },
25+
{ message = "^fix", group = "<!-- 1 -->Bug Fixes" },
26+
{ message = "^doc", group = "<!-- 2 -->Documentation" },
27+
{ message = "^perf", group = "<!-- 3 -->Performance" },
28+
{ message = "^test", group = "<!-- 4 -->Testing" },
2929
]

deny.toml

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,56 @@
11
[graph]
22
targets = [
3-
# Desktop
4-
{ triple = "x86_64-unknown-linux-gnu" },
5-
{ triple = "aarch64-unknown-linux-gnu" },
6-
{ triple = "x86_64-unknown-linux-musl" },
7-
{ triple = "aarch64-apple-darwin" },
8-
{ triple = "x86_64-apple-darwin" },
9-
{ triple = "x86_64-pc-windows-msvc" },
10-
# WASM
11-
{ triple = "wasm32-unknown-unknown" },
12-
# iOS
13-
{ triple = "aarch64-apple-ios-sim" },
14-
{ triple = "x86_64-apple-ios" },
15-
{ triple = "aarch64-apple-ios" },
16-
# Android
17-
{ triple = "aarch64-linux-android" },
18-
{ triple = "armv7-linux-androideabi" },
19-
{ triple = "x86_64-linux-android" },
3+
# Desktop
4+
{ triple = "x86_64-unknown-linux-gnu" },
5+
{ triple = "aarch64-unknown-linux-gnu" },
6+
{ triple = "x86_64-unknown-linux-musl" },
7+
{ triple = "aarch64-apple-darwin" },
8+
{ triple = "x86_64-apple-darwin" },
9+
{ triple = "x86_64-pc-windows-msvc" },
10+
# WASM
11+
{ triple = "wasm32-unknown-unknown" },
12+
# iOS
13+
{ triple = "aarch64-apple-ios-sim" },
14+
{ triple = "x86_64-apple-ios" },
15+
{ triple = "aarch64-apple-ios" },
16+
# Android
17+
{ triple = "aarch64-linux-android" },
18+
{ triple = "armv7-linux-androideabi" },
19+
{ triple = "x86_64-linux-android" },
2020
]
2121

2222
[advisories]
23-
ignore = [{ id = "RUSTSEC-2023-0071", reason = "No fix released yet. Working issue: https://github.com/RustCrypto/RSA/pull/394" }]
23+
ignore = [
24+
{ id = "RUSTSEC-2023-0071", reason = "No fix released yet. Working issue: https://github.com/RustCrypto/RSA/pull/394" },
25+
]
2426

2527
[licenses]
2628
confidence-threshold = 0.93
2729
# Checked for compatibility with our license (MPL-2.0)
2830
# using https://joinup.ec.europa.eu/collection/eupl/solution/joinup-licensing-assistant/jla-compatibility-checker
29-
allow = [
30-
"MPL-2.0",
31-
"Apache-2.0",
32-
"BSD-3-Clause",
33-
"MIT",
34-
"ISC",
35-
"Zlib",
36-
]
31+
allow = ["MPL-2.0", "Apache-2.0", "BSD-3-Clause", "MIT", "ISC", "Zlib"]
3732
exceptions = [{ allow = ["Unicode-DFS-2016"], name = "unicode-ident" }]
3833

3934
[[licenses.clarify]]
4035
name = "ring"
4136
expression = "MIT AND ISC"
42-
license-files = [
43-
{ path = "LICENSE", hash = 0xbd0eed23 }
44-
]
37+
license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
4538

4639
[[licenses.clarify]]
4740
name = "pkiprocmacros"
4841
expression = "Apache-2.0 OR MIT"
4942
license-files = [
50-
{ path = "../certval/LICENSE-APACHE", hash = 0x001c7e6c },
51-
{ path = "../certval/LICENSE-MIT", hash = 0x001c7e6c }
43+
{ path = "../certval/LICENSE-APACHE", hash = 0x001c7e6c },
44+
{ path = "../certval/LICENSE-MIT", hash = 0x001c7e6c },
5245
]
5346

5447
[sources]
5548
allow-org = { github = ["wireapp"] }
5649

5750
# We need to allow briansmith/ring since beltram/biscuit depends on it.
5851
allow-git = [
59-
"https://github.com/beltram/biscuit",
60-
"https://github.com/briansmith/ring"
52+
"https://github.com/beltram/biscuit",
53+
"https://github.com/briansmith/ring",
6154
]
6255

6356
[bans]

e2e-identity/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ signature = { workspace = true, optional = true }
3333
[dev-dependencies]
3434
wire-e2e-identity = { version = "0.13.0", path = ".", features = ["builder"] }
3535
rusty-jwt-tools = { version = "0.13.0", path = "../jwt", features = [
36-
"test-utils",
37-
"rsa",
36+
"test-utils",
37+
"rsa",
3838
] }
3939
base64 = { workspace = true }
4040
url = { workspace = true }

jwt/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ serde_json = { workspace = true }
2828
sha2 = { workspace = true }
2929
either = { workspace = true, features = ["serde"] }
3030
time = { workspace = true, features = [
31-
"serde",
32-
"serde-well-known",
33-
"wasm-bindgen",
31+
"serde",
32+
"serde-well-known",
33+
"wasm-bindgen",
3434
] }
3535
json-patch = { workspace = true }
3636
jwt-simple = { workspace = true }

0 commit comments

Comments
 (0)