[nongnu] elpa/rust-mode 4686c6e5f5 2/2: Merge pull request #554 from PuercoPop/update-rustfmt-default-edition

[ELPA Syncer]

branch: elpa/rust-mode
commit 4686c6e5f5042cb2c692f022afc4d170d344deda
Merge: a529a45181 5bcc32e13f
Author: Sibi Prabakaran <sibi@psibi.in>
Commit: GitHub <noreply@github.com>

    Merge pull request #554 from PuercoPop/update-rustfmt-default-edition
    
    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 a1062550c2..ea4dcb12a9 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 cab183c598..ba3dbe2982 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)