From e358bf65b06fe8b60abf48655d92f65c0cd6ad25 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Fri, 22 Oct 2021 16:03:13 +0200 Subject: [PATCH 1/2] rustfmt: upgrade to edition 2021 Signed-off-by: Miguel Ojeda --- .rustfmt.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index 4fea7c464f0d39..3de5cc497465c2 100644 --- 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 From a7c8147660bf01990bc1cfafa1ead7af3ef1f4b6 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Fri, 22 Oct 2021 16:02:11 +0200 Subject: [PATCH 2/2] scripts: generate_rust_analyzer: upgrade to edition 2021 Signed-off-by: Miguel Ojeda --- scripts/generate_rust_analyzer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py index 1beb5ee09251f8..024f8b884c1b4d 100755 --- 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" }