From 5bcc32e13fe1d5b3fd3b4a5ce0ead2c62921a1af Mon Sep 17 00:00:00 2001
From: Javier Olaechea <pirata@gmail.com>
Date: Sat, 31 Aug 2024 00:41:29 -0500
Subject: [PATCH] Update rustfmt's default edition: 2018 -> 2021

---
 Changelog.md    | 4 ++++
 rust-rustfmt.el | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index a106255..ea4dcb1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+# Unreleased
+
+- Update rustfmt's defaults to use 2021 edition ([#554](https://github.com/rust-lang/rust-mode/issues/509)).
+
 # v1.0.6
 
 - Add support for treesitter mode.
diff --git a/rust-rustfmt.el b/rust-rustfmt.el
index cab183c..ba3dbe2 100644
--- a/rust-rustfmt.el
+++ b/rust-rustfmt.el
@@ -30,7 +30,7 @@
   :type 'string
   :group 'rust-mode)
 
-(defcustom rust-rustfmt-switches '("--edition" "2018")
+(defcustom rust-rustfmt-switches '("--edition" "2021")
   "Arguments to pass when invoking the `rustfmt' executable."
   :type '(repeat string)
   :group 'rust-mode)