From 273d683cdf31191e212dbb8f7e96c1c438abca33 Mon Sep 17 00:00:00 2001
From: Mariusz Klochowicz <mariusz@klochowicz.com>
Date: Mon, 31 Jul 2023 16:22:57 -0700
Subject: [PATCH 1/2] chore: Update dprint to latest version

Old Rust plugin got archived and awaits a rewrite in wasm sandbox.
In the meantime, the recommended way is to directly call `rustfmt.

See: https://github.com/dprint/dprint-plugin-rustfmt

Add `rustfmt.toml` to preserve our custom formatting.
---
 dprint.json  | 37 +++++++++++++++++++++++--------------
 rustfmt.toml |  6 ++++++
 2 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/dprint.json b/dprint.json
index 8001a38c8..fd8cc7092 100644
--- a/dprint.json
+++ b/dprint.json
@@ -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",
@@ -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"
   ]
 }
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 000000000..73b7c71f2
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,6 @@
+wrap_comments = true
+comment_width = 100
+max_width = 100
+imports_granularity = "Item"
+group_imports = "One"
+edition = "2021"

From f688dcb1ab4cc6f97b55119fe9029b064e352390 Mon Sep 17 00:00:00 2001
From: Mariusz Klochowicz <mariusz@klochowicz.com>
Date: Mon, 31 Jul 2023 16:59:02 -0700
Subject: [PATCH 2/2] Revert "fix(ci): Pin dprint to version 0.39.1"

This reverts commit b6346e84db5e40ae918a184d554bb047ff703579.
---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8137a55d..c0a6e0f5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dprint/check@v2.1
-        with:
-          dprint-version: 0.39.1
 
   lint-commits:
     runs-on: ubuntu-latest