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.

Sign up for GitHub

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

Jump to bottom

ci: add taplo #163

Merged
merged 4 commits into from
Oct 28, 2023
Merged

ci: add taplo #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
188a942
ci: add taplo
KSXGitHub Oct 28, 2023
427dbaa
style: use taplo to format
KSXGitHub Oct 28, 2023
dd0827a
style: allow only 1 blank line
KSXGitHub Oct 28, 2023
bc3731c
ci: fix binary name
KSXGitHub Oct 28, 2023
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
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,10 @@ jobs:
restore-cache: false

- run: cargo fmt --all -- --check

- name: Install Taplo CLI
uses: ./.github/actions/binstall
with:
packages: [email protected]

- run: taplo format --check
3 changes: 2 additions & 1 deletion .taplo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ include = ["Cargo.toml", "crates/*/*.toml", "tasks/*/*.toml"]

[formatting]
align_entries = true
column_width = 120
column_width = 120
allowed_blank_lines = 1
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ walkdir = { version = "2.4.0" }
which = { version = "4.4.2" }
zune-inflate = { version = "0.2.54" }


# Dev dependencies
assert_cmd = { version = "2.0.12" }
criterion = { version = "0.5.1", features = ["async_tokio"] }
Expand Down
20 changes: 10 additions & 10 deletions crates/fs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "pacquet-fs"
description = "Filesystem utility functions used by pacquet"
version = "0.0.1"
publish = false
authors.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
repository.workspace = true
name = "pacquet-fs"
description = "Filesystem utility functions used by pacquet"
version = "0.0.1"
publish = false
authors.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
repository.workspace = true

Copy link
Member

@zkochan zkochan Oct 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really like this alignment with fixed width before =. It means that if there is a new field with a longer length, then all the other unrelated lines will be changed too, making diffs bigger.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zkochan I tried removing align_width = true from .taplo.toml before making this PR. The Cargo.toml files look messy without column alignment, so I decided to keep it as it is.

[target.'cfg(windows)'.dependencies]
junction = { workspace = true }
12 changes: 6 additions & 6 deletions crates/lockfile/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ repository.workspace = true
pacquet-diagnostics = { workspace = true }
pacquet-package-manifest = { workspace = true }

derive_more = { workspace = true }
node-semver = { workspace = true }
pipe-trait = { workspace = true }
serde = { workspace = true }
serde_yaml = { workspace = true }
split-first-char = { workspace = true }
derive_more = { workspace = true }
node-semver = { workspace = true }
pipe-trait = { workspace = true }
serde = { workspace = true }
serde_yaml = { workspace = true }
split-first-char = { workspace = true }

[dev-dependencies]
pretty_assertions = { workspace = true }
Expand Down
20 changes: 10 additions & 10 deletions crates/testing-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "pacquet-testing-utils"
version = "0.0.0"
description = "Common utilities to test pacquet code"
publish = false
authors.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
repository.workspace = true
name = "pacquet-testing-utils"
version = "0.0.0"
description = "Common utilities to test pacquet code"
publish = false
authors.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
assert_cmd = { workspace = true }
Expand Down