Skip to content

Commit

Permalink
Merge branch 'feature/better-taplo-config' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ejpcmac committed Aug 29, 2024
2 parents 6b8e674 + ec2ed45 commit c8e4076
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"editor.rulers": [
80
],
"evenBetterToml.taplo.bundled": false,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ single_use_lifetimes = "warn"
multiple_unsafe_ops_per_block = "deny"
undocumented_unsafe_blocks = "deny"

# Enable all pedantic warnings except a few.
# Enable all pedantic warnings
pedantic = { level = "warn", priority = -1 }
# …except a few.
case_sensitive_file_extension_comparisons = "allow"
inline_always = "allow"
linkedlist = "allow"
Expand Down
17 changes: 16 additions & 1 deletion taplo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include = [
"*.toml",
".cargo/*/*.toml",
".cargo/*.toml",
".config/*.toml",
"templates/**/*.toml",
"tests/**/*.toml",
"xtask/**/*.toml",
Expand All @@ -15,3 +16,17 @@ exclude = [
[formatting]
indent_string = " "
reorder_arrays = true

[[rule]]
include = ["**/Cargo.toml"]
keys = ["*dependencies", "features", "lints.*", "target.*.*dependencies"]

[rule.formatting]
reorder_keys = true

[[rule]]
include = ["**/Cargo.toml"]
keys = ["*dependencies.*", "target.*.*dependencies.*"]

[rule.formatting]
reorder_keys = false
2 changes: 1 addition & 1 deletion xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"
publish = false

[dependencies]
xshell = "0.2"
colored = "2"
xshell = "0.2"

0 comments on commit c8e4076

Please sign in to comment.