Merge #10607

bors[bot] · Veykril · web-flow · commit 56fbf5d7b201 · 2021-10-21T18:19:22.000Z
10607: Migrate to edition 2021 r=Veykril a=Veykril



Co-authored-by: Lukas Wirth &lt;lukastw97@gmail.com&gt;
diff --git a/crates/base_db/Cargo.toml b/crates/base_db/Cargo.toml
@@ -3,7 +3,7 @@ name = "base_db"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/cfg/Cargo.toml b/crates/cfg/Cargo.toml
@@ -3,7 +3,7 @@ name = "cfg"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml
@@ -3,7 +3,7 @@ name = "flycheck"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml
@@ -3,7 +3,7 @@ name = "hir"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml
@@ -3,7 +3,7 @@ name = "hir_def"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/hir_def/src/attr.rs b/crates/hir_def/src/attr.rs
@@ -1,12 +1,6 @@
 //! A higher level attributes based on TokenTree, with also some shortcuts.
 
-use std::{
-    convert::{TryFrom, TryInto},
-    fmt,
-    hash::Hash,
-    ops,
-    sync::Arc,
-};
+use std::{fmt, hash::Hash, ops, sync::Arc};
 
 use base_db::CrateId;
 use cfg::{CfgExpr, CfgOptions};
diff --git a/crates/hir_expand/Cargo.toml b/crates/hir_expand/Cargo.toml
@@ -3,7 +3,7 @@ name = "hir_expand"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
@@ -3,7 +3,7 @@ name = "hir_ty"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
@@ -3,7 +3,7 @@ name = "ide"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
@@ -2,8 +2,6 @@
 
 mod intra_doc_links;
 
-use std::convert::{TryFrom, TryInto};
-
 use either::Either;
 use pulldown_cmark::{BrokenLink, CowStr, Event, InlineStr, LinkType, Options, Parser, Tag};
 use pulldown_cmark_to_cmark::{cmark_with_options, Options as CmarkOptions};
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use ide_assists::utils::extract_trivial_expression;
 use ide_db::helpers::node_ext::expr_as_name_ref;
 use itertools::Itertools;
diff --git a/crates/ide_assists/Cargo.toml b/crates/ide_assists/Cargo.toml
@@ -3,7 +3,7 @@ name = "ide_assists"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/ide_completion/Cargo.toml b/crates/ide_completion/Cargo.toml
@@ -3,7 +3,7 @@ name = "ide_completion"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
@@ -3,7 +3,7 @@ name = "ide_db"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/ide_diagnostics/Cargo.toml b/crates/ide_diagnostics/Cargo.toml
@@ -3,7 +3,7 @@ name = "ide_diagnostics"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/ide_ssr/Cargo.toml b/crates/ide_ssr/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 description = "Structural search and replace of Rust code"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-analyzer/rust-analyzer"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/limit/Cargo.toml b/crates/limit/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
 authors = ["rust-analyzer developers"]
-edition = "2018"
+edition = "2021"
 
 [features]
 tracking = []
diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml
@@ -3,7 +3,7 @@ name = "mbe"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
@@ -3,7 +3,7 @@ name = "parser"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/paths/Cargo.toml b/crates/paths/Cargo.toml
@@ -3,7 +3,7 @@ name = "paths"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/paths/src/lib.rs b/crates/paths/src/lib.rs
@@ -2,7 +2,6 @@
 //! relative paths.
 use std::{
     borrow::Borrow,
-    convert::{TryFrom, TryInto},
     ffi::OsStr,
     ops,
     path::{Component, Path, PathBuf},
diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml
@@ -3,7 +3,7 @@ name = "proc_macro_api"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
@@ -3,7 +3,7 @@ name = "proc_macro_srv"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/proc_macro_test/Cargo.toml b/crates/proc_macro_test/Cargo.toml
@@ -2,7 +2,7 @@
 name = "proc_macro_test"
 version = "0.0.0"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]
diff --git a/crates/proc_macro_test/imp/Cargo.toml b/crates/proc_macro_test/imp/Cargo.toml
@@ -2,7 +2,7 @@
 name = "proc_macro_test_impl"
 version = "0.0.0"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]
diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml
@@ -3,7 +3,7 @@ name = "profile"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/project_model/Cargo.toml b/crates/project_model/Cargo.toml
@@ -3,7 +3,7 @@ name = "project_model"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs
@@ -1,6 +1,5 @@
 //! See [`CargoWorkspace`].
 
-use std::convert::{TryFrom, TryInto};
 use std::iter;
 use std::path::PathBuf;
 use std::{ops, process::Command};
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
@@ -28,7 +28,6 @@ mod build_scripts;
 mod tests;
 
 use std::{
-    convert::{TryFrom, TryInto},
     fs::{self, read_dir, ReadDir},
     io,
     process::Command,
diff --git a/crates/project_model/src/manifest_path.rs b/crates/project_model/src/manifest_path.rs
@@ -1,5 +1,5 @@
 //! See [`ManifestPath`].
-use std::{convert::TryFrom, ops, path::Path};
+use std::{ops, path::Path};
 
 use paths::{AbsPath, AbsPathBuf};
 
diff --git a/crates/project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs
@@ -4,7 +4,7 @@
 //! but we can't process `.rlib` and need source code instead. The source code
 //! is typically installed with `rustup component add rust-src` command.
 
-use std::{convert::TryFrom, env, fs, iter, ops, path::PathBuf, process::Command};
+use std::{env, fs, iter, ops, path::PathBuf, process::Command};
 
 use anyhow::{format_err, Result};
 use la_arena::{Arena, Idx};
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
@@ -2,7 +2,7 @@
 //! metadata` or `rust-project.json`) into representation stored in the salsa
 //! database -- `CrateGraph`.
 
-use std::{collections::VecDeque, convert::TryFrom, fmt, fs, process::Command};
+use std::{collections::VecDeque, fmt, fs, process::Command};
 
 use anyhow::{format_err, Context, Result};
 use base_db::{
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
@@ -7,7 +7,7 @@ description = "A language server for the Rust programming language"
 documentation = "https://rust-analyzer.github.io/manual.html"
 license = "MIT OR Apache-2.0"
 autobins = false
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
@@ -4,7 +4,7 @@
 mod logger;
 mod rustc_wrapper;
 
-use std::{convert::TryFrom, env, fs, path::Path, process};
+use std::{env, fs, path::Path, process};
 
 use lsp_server::Connection;
 use project_model::ProjectManifest;
diff --git a/crates/rust-analyzer/src/from_proto.rs b/crates/rust-analyzer/src/from_proto.rs
@@ -1,6 +1,4 @@
 //! Conversion lsp_types types to rust-analyzer specific ones.
-use std::convert::TryFrom;
-
 use ide::{Annotation, AnnotationKind, AssistKind, LineCol, LineColUtf16};
 use ide_db::base_db::{FileId, FilePosition, FileRange};
 use syntax::{TextRange, TextSize};
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
@@ -3,7 +3,6 @@
 //! `ide` crate.
 
 use std::{
-    convert::TryFrom,
     io::Write as _,
     process::{self, Stdio},
 };
diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs
@@ -10,7 +10,7 @@
 //! in release mode in VS Code. There's however "Rust Analyzer: Copy Run Command Line"
 //! which you can use to paste the command in terminal and add `--release` manually.
 
-use std::{convert::TryFrom, sync::Arc};
+use std::sync::Arc;
 
 use ide::{Change, CompletionConfig, FilePosition, TextSize};
 use ide_db::helpers::{
diff --git a/crates/rust-analyzer/tests/slow-tests/main.rs b/crates/rust-analyzer/tests/slow-tests/main.rs
@@ -350,7 +350,7 @@ fn test_format_document_2018() {
 [package]
 name = "foo"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 //- /src/lib.rs
 mod bar;
@@ -799,7 +799,7 @@ fn resolve_proc_macro() {
 [package]
 name = "foo"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 [dependencies]
 bar = {path = "../bar"}
 
@@ -818,7 +818,7 @@ fn main() {
 [package]
 name = "bar"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/crates/sourcegen/Cargo.toml b/crates/sourcegen/Cargo.toml
@@ -3,7 +3,7 @@ name = "sourcegen"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/stdx/Cargo.toml b/crates/stdx/Cargo.toml
@@ -3,7 +3,7 @@ name = "stdx"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 description = "Comment and whitespace preserving parser for the Rust language"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-analyzer/rust-analyzer"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
diff --git a/crates/syntax/fuzz/Cargo.toml b/crates/syntax/fuzz/Cargo.toml
@@ -3,7 +3,7 @@
 name = "syntax-fuzz"
 version = "0.0.1"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true
diff --git a/crates/syntax/src/ast/token_ext.rs b/crates/syntax/src/ast/token_ext.rs
@@ -1,9 +1,6 @@
 //! There are many AstNodes, but only a few tokens, so we hand-write them here.
 
-use std::{
-    borrow::Cow,
-    convert::{TryFrom, TryInto},
-};
+use std::borrow::Cow;
 
 use rustc_lexer::unescape::{unescape_literal, Mode};
 
diff --git a/crates/syntax/src/validation.rs b/crates/syntax/src/validation.rs
diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml
diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs
diff --git a/crates/text_edit/Cargo.toml b/crates/text_edit/Cargo.toml
diff --git a/crates/toolchain/Cargo.toml b/crates/toolchain/Cargo.toml
diff --git a/crates/tt/Cargo.toml b/crates/tt/Cargo.toml
diff --git a/crates/vfs-notify/Cargo.toml b/crates/vfs-notify/Cargo.toml
diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs
diff --git a/crates/vfs/Cargo.toml b/crates/vfs/Cargo.toml
diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs
diff --git a/lib/arena/Cargo.toml b/lib/arena/Cargo.toml
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
diff --git a/xtask/src/install.rs b/xtask/src/install.rs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-use std::convert::TryFrom;`
`2`		`-`
`3`	`1`	`use ide_assists::utils::extract_trivial_expression;`
`4`	`2`	`use ide_db::helpers::node_ext::expr_as_name_ref;`
`5`	`3`	`use itertools::Itertools;`