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

ojeda · web-flow · commit d285143853d1 · 2021-10-22T21:22:33.000+02:00
Update `rustfmt` and rust-analyzer to edition 2021
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"
             }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-edition = "2018"`
	`1`	`+edition = "2021"`
`2`	`2`	`newline_style = "Unix"`
`3`	`3`
`4`	`4`	`# Unstable options that help catching some mistakes in formatting and that we may want to enable`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=Tr`
`32`	`32`	`"is_proc_macro": is_proc_macro,`
`33`	`33`	`"deps": [{"crate": crates_indexes[dep], "name": dep} for dep in deps],`
`34`	`34`	`"cfg": cfg,`
`35`		`- "edition": "2018",`
	`35`	`+ "edition": "2021",`
`36`	`36`	`"env": {`
`37`	`37`	`"RUST_MODFILE": "This is only for rust-analyzer"`
`38`	`38`	`}`