rust-analyzer

diff --git a/bench_data/glorious_old_parser b/bench_data/glorious_old_parser
index 7e900dfeb1..764893daa1 100644
--- a/bench_data/glorious_old_parser
+++ b/bench_data/glorious_old_parser

@@ -1988,7 +1988,7 @@ impl<'a> Parser<'a> {

err.span_suggestion(

span,

"declare the type after the parameter binding",

- String::from("<identifier>: <type>"),

+ "<identifier>: <type>",

Applicability::HasPlaceholders,

);

} else if require_name && is_trait_item {

diff --git a/crates/hir-def/src/builtin_attr.rs b/crates/hir-def/src/builtin_attr.rs
index 0e7ce5f85f..39581b33a8 100644
--- a/crates/hir-def/src/builtin_attr.rs
+++ b/crates/hir-def/src/builtin_attr.rs

@@ -379,7 +379,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[

// ==========================================================================

rustc_attr!(rustc_allocator, Normal, template!(Word), WarnFollowing, IMPL_DETAIL),

- rustc_attr!(rustc_allocator_nounwind, Normal, template!(Word), WarnFollowing, IMPL_DETAIL),

+ rustc_attr!(rustc_nounwind, Normal, template!(Word), WarnFollowing, IMPL_DETAIL),

gated!(

alloc_error_handler, Normal, template!(Word), WarnFollowing,

experimental!(alloc_error_handler)

diff --git a/crates/hir-def/src/nameres.rs b/crates/hir-def/src/nameres.rs
index 2e392f741b..09732d3710 100644
--- a/crates/hir-def/src/nameres.rs
+++ b/crates/hir-def/src/nameres.rs

@@ -57,7 +57,7 @@ mod path_resolution;

#[cfg(test)]

mod tests;

-use std::{ops::Deref, sync::Arc};

+use std::{cmp::Ord, ops::Deref, sync::Arc};

use base_db::{CrateId, Edition, FileId};

use hir_expand::{name::Name, InFile, MacroCallId, MacroDefId};

diff --git a/crates/hir-ty/src/autoderef.rs b/crates/hir-ty/src/autoderef.rs
index 02332ea80d..78911d8dc0 100644
--- a/crates/hir-ty/src/autoderef.rs
+++ b/crates/hir-ty/src/autoderef.rs

@@ -1,7 +1,7 @@

//! In certain situations, rust automatically inserts derefs as necessary: for

//! example, field accesses `foo.bar` still work when `foo` is actually a

//! reference to a type with the field `bar`. This is an approximation of the

-//! logic in rustc (which lives in librustc_typeck/check/autoderef.rs).

+//! logic in rustc (which lives in rustc_hir_analysis/check/autoderef.rs).

use std::sync::Arc;

diff --git a/crates/hir-ty/src/infer.rs b/crates/hir-ty/src/infer.rs
index 53ea14504b..0b3c23f574 100644
--- a/crates/hir-ty/src/infer.rs
+++ b/crates/hir-ty/src/infer.rs

@@ -2,7 +2,7 @@

//! the type of each expression and pattern.

//!

//! For type inference, compare the implementations in rustc (the various

-//! check_* methods in librustc_typeck/check/mod.rs are a good entry point) and

+//! check_* methods in rustc_hir_analysis/check/mod.rs are a good entry point) and

//! IntelliJ-Rust (org.rust.lang.core.types.infer). Our entry point for

//! inference here is the `infer` function, which infers the types of all

//! expressions in a given function.

diff --git a/crates/hir-ty/src/infer/coerce.rs b/crates/hir-ty/src/infer/coerce.rs
index f54440bf5b..8df25c83c6 100644
--- a/crates/hir-ty/src/infer/coerce.rs
+++ b/crates/hir-ty/src/infer/coerce.rs

@@ -3,7 +3,7 @@

//! like going from `&Vec<T>` to `&[T]`.

//!

//! See <https://doc.rust-lang.org/nomicon/coercions.html> and

-//! `librustc_typeck/check/coercion.rs`.

+//! `rustc_hir_analysis/check/coercion.rs`.

use std::{iter, sync::Arc};

diff --git a/crates/hir-ty/src/method_resolution.rs b/crates/hir-ty/src/method_resolution.rs
index 20bed7bf3c..8bcfa2728f 100644
--- a/crates/hir-ty/src/method_resolution.rs
+++ b/crates/hir-ty/src/method_resolution.rs

@@ -1,7 +1,7 @@

//! This module is concerned with finding methods that a given type provides.

//! For details about how this works in rustc, see the method lookup page in the

//! [rustc guide](https://rust-lang.github.io/rustc-guide/method-lookup.html)

-//! and the corresponding code mostly in librustc_typeck/check/method/probe.rs.

+//! and the corresponding code mostly in rustc_hir_analysis/check/method/probe.rs.

use std::{iter, ops::ControlFlow, sync::Arc};

use arrayvec::ArrayVec;

diff --git a/crates/ide-db/src/imports/merge_imports.rs b/crates/ide-db/src/imports/merge_imports.rs
index 7fb4b90e6d..371d642c15 100644
--- a/crates/ide-db/src/imports/merge_imports.rs
+++ b/crates/ide-db/src/imports/merge_imports.rs

@@ -225,7 +225,7 @@ fn path_cmp_short(a: &ast::Path, b: &ast::Path) -> Ordering {

}

/// Compares two paths, if one ends earlier than the other the has_tl parameters decide which is

-/// greater as a a path that has a tree list should be greater, while one that just ends without

+/// greater as a path that has a tree list should be greater, while one that just ends without

/// a tree list should be considered less.

pub(super) fn use_tree_path_cmp(

a: &ast::Path,

diff --git a/crates/proc-macro-srv/src/abis/abi_sysroot/ra_server.rs b/crates/proc-macro-srv/src/abis/abi_sysroot/ra_server.rs
index 52eb7ce17d..e4e43e97dd 100644
--- a/crates/proc-macro-srv/src/abis/abi_sysroot/ra_server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_sysroot/ra_server.rs

@@ -37,23 +37,6 @@ pub struct SourceFile {

type Level = super::proc_macro::Level;

type LineColumn = super::proc_macro::LineColumn;

-/// A structure representing a diagnostic message and associated children

-/// messages.

-#[derive(Clone, Debug)]

-pub struct Diagnostic {

- level: Level,

- message: String,

- spans: Vec<Span>,

- children: Vec<Diagnostic>,

-impl Diagnostic {

- /// Creates a new diagnostic with the given `level` and `message`.

- pub fn new<T: Into<String>>(level: Level, message: T) -> Diagnostic {

- Diagnostic { level, message: message.into(), spans: vec![], children: vec![] }

- }

pub struct FreeFunctions;

#[derive(Default)]

@@ -65,8 +48,6 @@ impl server::Types for RustAnalyzer {

type FreeFunctions = FreeFunctions;

type TokenStream = TokenStream;

type SourceFile = SourceFile;

- type MultiSpan = Vec<Span>;

- type Diagnostic = Diagnostic;

type Span = Span;

type Symbol = Symbol;

}

@@ -90,6 +71,10 @@ impl server::FreeFunctions for RustAnalyzer {

span: tt::TokenId::unspecified(),

})

}

+ fn emit_diagnostic(&mut self, _: bridge::Diagnostic<Self::Span>) {

+ // FIXME handle diagnostic

+ }

}

impl server::TokenStream for RustAnalyzer {

@@ -282,30 +267,6 @@ impl server::SourceFile for RustAnalyzer {

}

-impl server::Diagnostic for RustAnalyzer {

- fn new(&mut self, level: Level, msg: &str, spans: Self::MultiSpan) -> Self::Diagnostic {

- let mut diag = Diagnostic::new(level, msg);

- diag.spans = spans;

- diag

- }

- fn sub(

- &mut self,

- _diag: &mut Self::Diagnostic,

- _level: Level,

- _msg: &str,

- _spans: Self::MultiSpan,

- ) {

- // FIXME handle diagnostic

- //

- }

- fn emit(&mut self, _diag: Self::Diagnostic) {

- // FIXME handle diagnostic

- // diag.emit()

- }

impl server::Span for RustAnalyzer {

fn debug(&mut self, span: Self::Span) -> String {

format!("{:?}", span.0)

@@ -372,18 +333,6 @@ impl server::Span for RustAnalyzer {

}

-impl server::MultiSpan for RustAnalyzer {

- fn new(&mut self) -> Self::MultiSpan {

- // FIXME handle span

- vec![]

- }

- fn push(&mut self, other: &mut Self::MultiSpan, span: Self::Span) {

- //TODP

- other.push(span)

- }

impl server::Symbol for RustAnalyzer {

fn normalize_and_validate_ident(&mut self, string: &str) -> Result<Self::Symbol, ()> {

// FIXME: nfc-normalize and validate idents

diff --git a/crates/rust-analyzer/src/bin/logger.rs b/crates/rust-analyzer/src/bin/logger.rs
index 298814af5a..ac10721d95 100644
--- a/crates/rust-analyzer/src/bin/logger.rs
+++ b/crates/rust-analyzer/src/bin/logger.rs

@@ -132,7 +132,7 @@ where

let ext = span.extensions();

- // `FormattedFields` is a a formatted representation of the span's

+ // `FormattedFields` is a formatted representation of the span's

// fields, which is stored in its extensions by the `fmt` layer's

// `new_span` method. The fields will have been formatted

// by the same field formatter that's provided to the event

diff --git a/crates/syntax/src/validation.rs b/crates/syntax/src/validation.rs
index b9f2b51323..1eea234645 100644
--- a/crates/syntax/src/validation.rs
+++ b/crates/syntax/src/validation.rs

@@ -5,9 +5,7 @@

mod block;

use rowan::Direction;

-use rustc_lexer::unescape::{

- self, unescape_byte, unescape_byte_literal, unescape_char, unescape_literal, Mode,

-};

+use rustc_lexer::unescape::{self, unescape_byte, unescape_char, unescape_literal, Mode};

use crate::{

algo,

@@ -143,7 +141,7 @@ fn validate_literal(literal: ast::Literal, acc: &mut Vec<SyntaxError>) {

ast::LiteralKind::ByteString(s) => {

if !s.is_raw() {

if let Some(without_quotes) = unquote(text, 2, '"') {

- unescape_byte_literal(without_quotes, Mode::ByteStr, &mut |range, char| {

+ unescape_literal(without_quotes, Mode::ByteStr, &mut |range, char| {

if let Err(err) = char {

push_err(2, (range.start, err));

}