about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorNoah Lev <camelidcamel@gmail.com>2021-09-19 11:19:51 -0700
committerJoshua Nelson <github@jyn.dev>2021-10-10 08:28:12 -0500
commitf4708b660ce4ad989f2c36daa6dca997b9d0d253 (patch)
tree406456ca3ce1aa7f04f19fc06710a43c8c02cd00 /src/doc
parentb25420587448621c10ac6ea69de0e2c75fba1560 (diff)
downloadrust-f4708b660ce4ad989f2c36daa6dca997b9d0d253.tar.gz
rust-f4708b660ce4ad989f2c36daa6dca997b9d0d253.zip
Recommend `rustfmt --edition=2021`
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/rustc-dev-guide/src/building/suggested.md2
-rw-r--r--src/doc/rustc-dev-guide/src/getting-started.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/rustc-dev-guide/src/building/suggested.md b/src/doc/rustc-dev-guide/src/building/suggested.md
index f1665efdc78..24e25f5d050 100644
--- a/src/doc/rustc-dev-guide/src/building/suggested.md
+++ b/src/doc/rustc-dev-guide/src/building/suggested.md
@@ -33,7 +33,7 @@ you can write: <!-- date: 2021-09 --><!-- the date comment is for the edition be
     ],
     "rust-analyzer.rustfmt.overrideCommand": [
         "./build/TARGET_TRIPLE/stage0/bin/rustfmt",
-        "--edition=2018"
+        "--edition=2021"
     ],
     "editor.formatOnSave": true,
     "rust-analyzer.cargo.runBuildScripts": false,
diff --git a/src/doc/rustc-dev-guide/src/getting-started.md b/src/doc/rustc-dev-guide/src/getting-started.md
index 4d77b03dbe5..abc084c2bec 100644
--- a/src/doc/rustc-dev-guide/src/getting-started.md
+++ b/src/doc/rustc-dev-guide/src/getting-started.md
@@ -293,7 +293,7 @@ format-on-save turned on. It's a good habit to run `./x.py fmt` before every
 commit, as this reduces conflicts later. The pinned version is built under
 `build/<target>/stage0/bin/rustfmt`, so if you want, you can use it for a
 single file or for format-on-save in your editor, which can be faster than `./x.py fmt`.
-You'll have to pass the <!-- date: 2021-09 --> `--edition=2018` argument
+You'll have to pass the <!-- date: 2021-09 --> `--edition=2021` argument
 yourself when calling `rustfmt` directly.
 
 One last thing: you can use `RUSTC_LOG=XXX` to get debug logging. [Read more