Merge pull request torvalds#530 from ojeda/edition-2021

Update `rustfmt` and rust-analyzer to edition 2021
ojeda · Oct 22, 2021 · d285143 · d285143
2 parents cb0df90 + a7c8147
commit d285143
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -1,4 +1,4 @@
-edition = "2018"
+edition = "2021"
 newline_style = "Unix"
 
 # Unstable options that help catching some mistakes in formatting and that we may want to enable

diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
@@ -32,7 +32,7 @@ def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=Tr
             "is_proc_macro": is_proc_macro,
             "deps": [{"crate": crates_indexes[dep], "name": dep} for dep in deps],
             "cfg": cfg,
-            "edition": "2018",
+            "edition": "2021",
             "env": {
                 "RUST_MODFILE": "This is only for rust-analyzer"
             }