From 3a232c80231c88cb582e378ce0e0bafa1c4ab503 Mon Sep 17 00:00:00 2001
From: zxq5 <zxq5@zxq5.dev>
Date: Sat, 22 Feb 2025 03:39:22 +0000
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' into
 dev (and add cargo fmt on save)

---
 .vscode/settings.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index c6e307c..c7cc8ca 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,9 @@
 {
     "rust-analyzer.cargo.allTargets": false,
     "rust-analyzer.cargo.target": "x86_64-kernel",
-}
\ No newline at end of file
+    "[rust]": {
+        "editor.defaultFormatter": "rust-lang.rust-analyzer",
+        "editor.formatOnSave": true
+    }
+}
+