summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSibi Prabakaran <sibi@psibi.in>2024-09-02 18:30:57 +0530
committerGitHub <noreply@github.com>2024-09-02 18:30:57 +0530
commit4686c6e5f5042cb2c692f022afc4d170d344deda (patch)
tree0fd29377d7fcacbca21ef944ee49596f210a56c8
parenta529a4518120bd1c662edc31b82062f41bbfb990 (diff)
parent5bcc32e13fe1d5b3fd3b4a5ce0ead2c62921a1af (diff)
downloadrust-mode-4686c6e5f5042cb2c692f022afc4d170d344deda.tar.gz
Merge pull request #554 from PuercoPop/update-rustfmt-default-edition
Update rustfmt's default edition: 2018 -> 2021
-rw-r--r--Changelog.md4
-rw-r--r--rust-rustfmt.el2
2 files changed, 5 insertions, 1 deletions
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)