Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brody CI testing: chore: enforce taplo toml formatting #3

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,20 @@ jobs:
working-directory: rustls/
run: cargo check-external-types

taplo:
name: Taplo
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
- run: cargo install taplo-cli --locked
- run: taplo format --check

openssl-tests:
name: Run openssl-tests
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
chain_width=40
chain_width = 40
3 changes: 3 additions & 0 deletions .taplo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[formatting]
align_comments = false
column_width = 110
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ exclude = [
]

default-members = [
# ---
"examples",
"rustls",
]
Expand Down Expand Up @@ -84,7 +85,7 @@ signature = "2"
subtle = { version = "2.5.0", default-features = false }
time = { version = "0.3.6", default-features = false }
tikv-jemallocator = "0.6"
tokio = { version = "1.34", features = ["io-util", "macros", "net", "rt"]}
tokio = { version = "1.34", features = ["io-util", "macros", "net", "rt"] }
webpki = { package = "rustls-webpki", version = "0.102.8", features = ["alloc"], default-features = false }
webpki-roots = "0.26"
x25519-dalek = "2"
Expand Down
2 changes: 1 addition & 1 deletion connect-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "Rustls connectivity based integration tests."
publish = false

[dependencies]
rustls = { path = "../rustls", features = [ "logging" ]}
rustls = { path = "../rustls", features = ["logging"] }

[dev-dependencies]
hickory-resolver = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ hickory-resolver = { workspace = true }
log = { workspace = true }
mio = { workspace = true }
rcgen = { workspace = true }
rustls = { path = "../rustls", features = [ "logging" ]}
rustls = { path = "../rustls", features = ["logging"] }
serde = { workspace = true }
tokio = { workspace = true }
webpki-roots = { workspace = true }
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cargo-fuzz = true
[dependencies]
env_logger = "0.11"
libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
rustls = { path = "../rustls", default-features = false, features = ["std", "tls12", "custom-provider"]}
rustls = { path = "../rustls", default-features = false, features = ["std", "tls12", "custom-provider"] }
rustls-fuzzing-provider = { path = "../rustls-fuzzing-provider" }

# Prevent this from interfering with workspaces
Expand Down
5 changes: 3 additions & 2 deletions rustls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ rustdoc-args = ["--cfg", "docsrs"]

[package.metadata.cargo_check_external_types]
allowed_external_types = [
"rustls_pki_types",
"rustls_pki_types::*",
# ---
"rustls_pki_types",
"rustls_pki_types::*",
]
Loading