Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-11 20:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Migrate to edition 2021

Browse source
This commit is contained in:
Lukas Wirth 2021-10-21 17:49:28 +02:00
parent 6aeeb4ef33
commit 1294bfce86
56 changed files with 48 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/base_db/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "base_db"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/cfg/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "cfg"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/flycheck/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "flycheck"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/hir/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "hir"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/hir_def/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "hir_def"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

8
crates/hir_def/src/attr.rs
View file

@ -1,12 +1,6 @@
//! A higher level attributes based on TokenTree, with also some shortcuts. //! A higher level attributes based on TokenTree, with also some shortcuts.
use std::{ use std::{fmt, hash::Hash, ops, sync::Arc};
convert::{TryFrom, TryInto},
fmt,
hash::Hash,
ops,
sync::Arc,
};
use base_db::CrateId; use base_db::CrateId;
use cfg::{CfgExpr, CfgOptions}; use cfg::{CfgExpr, CfgOptions};

2
crates/hir_expand/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "hir_expand"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/hir_ty/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "hir_ty"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/ide/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "ide"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/ide/src/doc_links.rs
View file

@ -2,8 +2,6 @@
mod intra_doc_links; mod intra_doc_links;
use std::convert::{TryFrom, TryInto};
use either::Either; use either::Either;
use pulldown_cmark::{BrokenLink, CowStr, Event, InlineStr, LinkType, Options, Parser, Tag}; use pulldown_cmark::{BrokenLink, CowStr, Event, InlineStr, LinkType, Options, Parser, Tag};
use pulldown_cmark_to_cmark::{cmark_with_options, Options as CmarkOptions}; use pulldown_cmark_to_cmark::{cmark_with_options, Options as CmarkOptions};

2
crates/ide/src/join_lines.rs
View file

@ -1,5 +1,3 @@
use std::convert::TryFrom;
use ide_assists::utils::extract_trivial_expression; use ide_assists::utils::extract_trivial_expression;
use ide_db::helpers::node_ext::expr_as_name_ref; use ide_db::helpers::node_ext::expr_as_name_ref;
use itertools::Itertools; use itertools::Itertools;

2
crates/ide_assists/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "ide_assists"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/ide_completion/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "ide_completion"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/ide_db/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "ide_db"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/ide_diagnostics/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "ide_diagnostics"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/ide_ssr/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.0.0"
description = "Structural search and replace of Rust code" description = "Structural search and replace of Rust code"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-analyzer/rust-analyzer" repository = "https://github.com/rust-analyzer/rust-analyzer"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/limit/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
authors = ["rust-analyzer developers"] authors = ["rust-analyzer developers"]
edition = "2018" edition = "2021"
[features] [features]
tracking = [] tracking = []

2
crates/mbe/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "mbe"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/parser/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "parser"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/paths/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "paths"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

1
crates/paths/src/lib.rs
View file

@ -2,7 +2,6 @@
//! relative paths. //! relative paths.
use std::{ use std::{
borrow::Borrow, borrow::Borrow,
convert::{TryFrom, TryInto},
ffi::OsStr, ffi::OsStr,
ops, ops,
path::{Component, Path, PathBuf}, path::{Component, Path, PathBuf},

2
crates/proc_macro_api/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "proc_macro_api"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/proc_macro_srv/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "proc_macro_srv"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/proc_macro_test/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "proc_macro_test" name = "proc_macro_test"
version = "0.0.0" version = "0.0.0"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
publish = false publish = false
[lib] [lib]

2
crates/proc_macro_test/imp/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "proc_macro_test_impl" name = "proc_macro_test_impl"
version = "0.0.0" version = "0.0.0"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
publish = false publish = false
[lib] [lib]

2
crates/profile/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "profile"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/project_model/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "project_model"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

1
crates/project_model/src/cargo_workspace.rs
View file

@ -1,6 +1,5 @@
//! See [`CargoWorkspace`]. //! See [`CargoWorkspace`].
use std::convert::{TryFrom, TryInto};
use std::iter; use std::iter;
use std::path::PathBuf; use std::path::PathBuf;
use std::{ops, process::Command}; use std::{ops, process::Command};

1
crates/project_model/src/lib.rs
View file

@ -28,7 +28,6 @@ mod build_scripts;
mod tests; mod tests;
use std::{ use std::{
convert::{TryFrom, TryInto},
fs::{self, read_dir, ReadDir}, fs::{self, read_dir, ReadDir},
io, io,
process::Command, process::Command,

2
crates/project_model/src/manifest_path.rs
View file

@ -1,5 +1,5 @@
//! See [`ManifestPath`]. //! See [`ManifestPath`].
use std::{convert::TryFrom, ops, path::Path}; use std::{ops, path::Path};
use paths::{AbsPath, AbsPathBuf}; use paths::{AbsPath, AbsPathBuf};

2
crates/project_model/src/sysroot.rs
View file

@ -4,7 +4,7 @@
//! but we can't process `.rlib` and need source code instead. The source code //! but we can't process `.rlib` and need source code instead. The source code
//! is typically installed with `rustup component add rust-src` command. //! 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 anyhow::{format_err, Result};
use la_arena::{Arena, Idx}; use la_arena::{Arena, Idx};

2
crates/project_model/src/workspace.rs
View file

@ -2,7 +2,7 @@
//! metadata` or `rust-project.json`) into representation stored in the salsa //! metadata` or `rust-project.json`) into representation stored in the salsa
//! database -- `CrateGraph`. //! 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 anyhow::{format_err, Context, Result};
use base_db::{ use base_db::{

2
crates/rust-analyzer/Cargo.toml
View file

@ -7,7 +7,7 @@ description = "A language server for the Rust programming language"
documentation = "https://rust-analyzer.github.io/manual.html" documentation = "https://rust-analyzer.github.io/manual.html"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
autobins = false autobins = false
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/rust-analyzer/src/bin/main.rs
View file

@ -4,7 +4,7 @@
mod logger; mod logger;
mod rustc_wrapper; mod rustc_wrapper;
use std::{convert::TryFrom, env, fs, path::Path, process}; use std::{env, fs, path::Path, process};
use lsp_server::Connection; use lsp_server::Connection;
use project_model::ProjectManifest; use project_model::ProjectManifest;

2
crates/rust-analyzer/src/from_proto.rs
View file

@ -1,6 +1,4 @@
//! Conversion lsp_types types to rust-analyzer specific ones. //! Conversion lsp_types types to rust-analyzer specific ones.
use std::convert::TryFrom;
use ide::{Annotation, AnnotationKind, AssistKind, LineCol, LineColUtf16}; use ide::{Annotation, AnnotationKind, AssistKind, LineCol, LineColUtf16};
use ide_db::base_db::{FileId, FilePosition, FileRange}; use ide_db::base_db::{FileId, FilePosition, FileRange};
use syntax::{TextRange, TextSize}; use syntax::{TextRange, TextSize};

1
crates/rust-analyzer/src/handlers.rs
View file

@ -3,7 +3,6 @@
//! `ide` crate. //! `ide` crate.
use std::{ use std::{
convert::TryFrom,
io::Write as _, io::Write as _,
process::{self, Stdio}, process::{self, Stdio},
}; };

2
crates/rust-analyzer/src/integrated_benchmarks.rs
View file

@ -10,7 +10,7 @@
//! in release mode in VS Code. There's however "Rust Analyzer: Copy Run Command Line" //! 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. //! 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::{Change, CompletionConfig, FilePosition, TextSize};
use ide_db::helpers::{ use ide_db::helpers::{

6
crates/rust-analyzer/tests/slow-tests/main.rs
View file

@ -350,7 +350,7 @@ fn test_format_document_2018() {
[package] [package]
name = "foo" name = "foo"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2021"
//- /src/lib.rs //- /src/lib.rs
mod bar; mod bar;
@ -799,7 +799,7 @@ fn resolve_proc_macro() {
[package] [package]
name = "foo" name = "foo"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2021"
[dependencies] [dependencies]
bar = {path = "../bar"} bar = {path = "../bar"}
@ -818,7 +818,7 @@ fn main() {
[package] [package]
name = "bar" name = "bar"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2021"
[lib] [lib]
proc-macro = true proc-macro = true

2
crates/sourcegen/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "sourcegen"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/stdx/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "stdx"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/syntax/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.0.0"
description = "Comment and whitespace preserving parser for the Rust language" description = "Comment and whitespace preserving parser for the Rust language"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-analyzer/rust-analyzer" repository = "https://github.com/rust-analyzer/rust-analyzer"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/syntax/fuzz/Cargo.toml
View file

@ -3,7 +3,7 @@
name = "syntax-fuzz" name = "syntax-fuzz"
version = "0.0.1" version = "0.0.1"
publish = false publish = false
edition = "2018" edition = "2021"
[package.metadata] [package.metadata]
cargo-fuzz = true cargo-fuzz = true

5
crates/syntax/src/ast/token_ext.rs
View file

@ -1,9 +1,6 @@
//! There are many AstNodes, but only a few tokens, so we hand-write them here. //! There are many AstNodes, but only a few tokens, so we hand-write them here.
use std::{ use std::borrow::Cow;
borrow::Cow,
convert::{TryFrom, TryInto},
};
use rustc_lexer::unescape::{unescape_literal, Mode}; use rustc_lexer::unescape::{unescape_literal, Mode};

2
crates/syntax/src/validation.rs
View file

@ -4,8 +4,6 @@
mod block; mod block;
use std::convert::TryFrom;
use rowan::Direction; use rowan::Direction;
use rustc_lexer::unescape::{ use rustc_lexer::unescape::{
self, unescape_byte, unescape_byte_literal, unescape_char, unescape_literal, Mode, self, unescape_byte, unescape_byte_literal, unescape_char, unescape_literal, Mode,

2
crates/test_utils/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "test_utils"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

1
crates/test_utils/src/lib.rs
View file

@ -12,7 +12,6 @@ mod assert_linear;
use std::{ use std::{
collections::BTreeMap, collections::BTreeMap,
convert::{TryFrom, TryInto},
env, fs, env, fs,
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };

2
crates/text_edit/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "text_edit"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/toolchain/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "toolchain"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/tt/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "tt"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/vfs-notify/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "vfs-notify"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
crates/vfs-notify/src/lib.rs
View file

@ -6,7 +6,7 @@
//! //!
//! Hopefully, one day a reliable file watching/walking crate appears on //! Hopefully, one day a reliable file watching/walking crate appears on
//! crates.io, and we can reduce this to trivial glue code. //! crates.io, and we can reduce this to trivial glue code.
use std::{convert::TryFrom, fs}; use std::fs;
use crossbeam_channel::{never, select, unbounded, Receiver, Sender}; use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
use notify::{RecommendedWatcher, RecursiveMode, Watcher}; use notify::{RecommendedWatcher, RecursiveMode, Watcher};

2
crates/vfs/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "vfs"
version = "0.0.0" version = "0.0.0"
description = "TBD" description = "TBD"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

1
crates/vfs/src/vfs_path.rs
View file

@ -267,7 +267,6 @@ mod windows_paths {
#[cfg(test)] #[cfg(test)]
fn vfs(str: &str) -> super::VfsPath { fn vfs(str: &str) -> super::VfsPath {
use super::{AbsPathBuf, VfsPath}; use super::{AbsPathBuf, VfsPath};
use std::convert::TryFrom;
VfsPath::from(AbsPathBuf::try_from(str).unwrap()) VfsPath::from(AbsPathBuf::try_from(str).unwrap())
} }
} }

2
lib/arena/Cargo.toml
View file

@ -6,4 +6,4 @@ license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-analyzer/rust-analyzer" repository = "https://github.com/rust-analyzer/rust-analyzer"
documentation = "https://docs.rs/la-arena" documentation = "https://docs.rs/la-arena"
categories = ["data-structures", "memory-management", "rust-patterns"] categories = ["data-structures", "memory-management", "rust-patterns"]
edition = "2018" edition = "2021"

2
xtask/Cargo.toml
View file

@ -1,5 +1,5 @@
[package] [package]
edition = "2018" edition = "2021"
name = "xtask" name = "xtask"
version = "0.1.0" version = "0.1.0"
publish = false publish = false

2
xtask/src/install.rs
View file

@ -8,7 +8,7 @@ use xshell::{cmd, pushd};
use crate::flags; use crate::flags;
// Latest stable, feel free to send a PR if this lags behind. // Latest stable, feel free to send a PR if this lags behind.
const REQUIRED_RUST_VERSION: u32 = 55; const REQUIRED_RUST_VERSION: u32 = 56;
impl flags::Install { impl flags::Install {
pub(crate) fn run(self) -> Result<()> { pub(crate) fn run(self) -> Result<()> {