Skip to content

Commit

Permalink
Merge pull request #1046 from get10101/chore/bump-dprint
Browse files Browse the repository at this point in the history
chore: Update dprint to latest version
  • Loading branch information
klochowicz authored Aug 1, 2023
2 parents 51ae61c + f688dcb commit 088b31e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 16 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: dprint/[email protected]
with:
dprint-version: 0.39.1

lint-commits:
runs-on: ubuntu-latest
Expand Down
37 changes: 23 additions & 14 deletions dprint.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{
"$schema": "https://dprint.dev/schemas/v0.json",
"projectType": "openSource",
"incremental": true,
"rustfmt": {
"imports_granularity": "item",
"wrap_comments": true,
"comment_width": 100,
"max_width": 100
},
"sql": {
"uppercase": true
},
"includes": ["**/*.{md,rs,json,sql,yml,yaml,toml}"],
"json": {},
"markdown": {},
"toml": {},
"dockerfile": {},
"includes": [
"**/*.{rs,json,md,toml,dockerfile,yml,yaml}"
],
"excludes": [
"**/target",
"**/sqlx-data.json",
Expand All @@ -22,12 +21,22 @@
"coordinator/migrations/00000000000000_diesel_initial_setup/up.sql",
"maker/migrations/00000000000000_diesel_initial_setup/up.sql"
],
"exec": {
"commands": [
{
"command": "rustfmt",
"exts": [
"rs"
]
}
]
},
"plugins": [
"https://plugins.dprint.dev/markdown-0.13.0.wasm",
"https://plugins.dprint.dev/rustfmt-0.6.2.json@886c6f3161cf020c2d75160262b0f56d74a521e05cfb91ec4f956650c8ca76ca",
"https://plugins.dprint.dev/json-0.7.2.wasm",
"https://plugins.dprint.dev/sql-0.1.1.wasm",
"https://plugins.dprint.dev/prettier-0.11.0.json@385edfc0e1212b3be6412cda49322ecd62cb38ac71b9b463869bebf23a4767e3",
"https://plugins.dprint.dev/toml-0.5.4.wasm"
"https://plugins.dprint.dev/json-0.17.4.wasm",
"https://plugins.dprint.dev/markdown-0.15.3.wasm",
"https://plugins.dprint.dev/toml-0.5.4.wasm",
"https://plugins.dprint.dev/dockerfile-0.3.0.wasm",
"https://plugins.dprint.dev/exec-0.4.3.json@42343548b8022c99b1d750be6b894fe6b6c7ee25f72ae9f9082226dd2e515072",
"https://plugins.dprint.dev/sql-0.2.0.wasm"
]
}
6 changes: 6 additions & 0 deletions rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
wrap_comments = true
comment_width = 100
max_width = 100
imports_granularity = "Item"
group_imports = "One"
edition = "2021"

0 comments on commit 088b31e

Please sign in to comment.