rust-analyzer

diff --git a/crates/hir-ty/src/infer.rs b/crates/hir-ty/src/infer.rs
index 1977f00517..9cea414e1a 100644
--- a/crates/hir-ty/src/infer.rs
+++ b/crates/hir-ty/src/infer.rs

@@ -221,6 +221,9 @@ pub enum InferenceDiagnostic {

UnresolvedAssocItem {

id: ExprOrPatId,

+ UnresolvedIdent {

+ expr: ExprId,

+ },

// FIXME: This should be emitted in body lowering

BreakOutsideOfLoop {

expr: ExprId,

diff --git a/crates/hir-ty/src/infer/expr.rs b/crates/hir-ty/src/infer/expr.rs
index 428ed6748c..c377a51e7d 100644
--- a/crates/hir-ty/src/infer/expr.rs
+++ b/crates/hir-ty/src/infer/expr.rs

@@ -13,7 +13,7 @@ use hir_def::{

ArithOp, Array, BinaryOp, ClosureKind, Expr, ExprId, LabelId, Literal, Statement, UnaryOp,

lang_item::{LangItem, LangItemTarget},

- path::{GenericArg, GenericArgs},

+ path::{GenericArg, GenericArgs, Path},

BlockId, ConstParamId, FieldId, ItemContainerId, Lookup, TupleFieldId, TupleId,

};

use hir_expand::name::{name, Name};

@@ -439,7 +439,17 @@ impl InferenceContext<'_> {

}

Expr::Path(p) => {

let g = self.resolver.update_to_inner_scope(self.db.upcast(), self.owner, tgt_expr);

- let ty = self.infer_path(p, tgt_expr.into()).unwrap_or_else(|| self.err_ty());

+ let ty = match self.infer_path(p, tgt_expr.into()) {

+ Some(ty) => ty,

+ None => {

+ if matches!(p, Path::Normal { mod_path, .. } if mod_path.is_ident()) {

+ self.push_diagnostic(InferenceDiagnostic::UnresolvedIdent {

+ expr: tgt_expr,

+ });

+ }

+ self.err_ty()

+ }

+ };

self.resolver.reset_to_guard(g);

}

diff --git a/crates/hir/src/diagnostics.rs b/crates/hir/src/diagnostics.rs
index d351e257d2..80cd0c9c79 100644
--- a/crates/hir/src/diagnostics.rs
+++ b/crates/hir/src/diagnostics.rs

@@ -87,6 +87,7 @@ diagnostics![

UnresolvedMacroCall,

UnresolvedMethodCall,

UnresolvedModule,

+ UnresolvedIdent,

UnresolvedProcMacro,

UnusedMut,

UnusedVariable,

@@ -243,6 +244,11 @@ pub struct UnresolvedAssocItem {

}

#[derive(Debug)]

+pub struct UnresolvedIdent {

+ pub expr: InFile<AstPtr<ast::Expr>>,

+#[derive(Debug)]

pub struct PrivateField {

pub expr: InFile<AstPtr<ast::Expr>>,

pub field: Field,

@@ -588,6 +594,10 @@ impl AnyDiagnostic {

};

UnresolvedAssocItem { expr_or_pat }.into()

}

+ &InferenceDiagnostic::UnresolvedIdent { expr } => {

+ let expr = expr_syntax(expr);

+ UnresolvedIdent { expr }.into()

+ }

&InferenceDiagnostic::BreakOutsideOfLoop { expr, is_break, bad_value_break } => {

let expr = expr_syntax(expr);

BreakOutsideOfLoop { expr, is_break, bad_value_break }.into()

diff --git a/crates/ide-diagnostics/src/handlers/inactive_code.rs b/crates/ide-diagnostics/src/handlers/inactive_code.rs
index 7db5ea04fb..785a42352b 100644
--- a/crates/ide-diagnostics/src/handlers/inactive_code.rs
+++ b/crates/ide-diagnostics/src/handlers/inactive_code.rs

@@ -60,6 +60,7 @@ fn f() {

#[cfg(a)] let x = 0; // let statement

//^^^^^^^^^^^^^^^^^^^^ weak: code is inactive due to #[cfg] directives: a is disabled

+ fn abc() {}

abc(#[cfg(a)] 0);

//^^^^^^^^^^^ weak: code is inactive due to #[cfg] directives: a is disabled

let x = Struct {

diff --git a/crates/ide-diagnostics/src/handlers/missing_fields.rs b/crates/ide-diagnostics/src/handlers/missing_fields.rs
index c70f39eb28..09daefd084 100644
--- a/crates/ide-diagnostics/src/handlers/missing_fields.rs
+++ b/crates/ide-diagnostics/src/handlers/missing_fields.rs

@@ -634,7 +634,8 @@ struct TestStruct { one: i32, two: i64 }

fn test_fn() {

let one = 1;

- let s = TestStruct{ ..a };

+ let a = TestStruct{ one, two: 2 };

+ let _ = TestStruct{ ..a };

}

"#,

);

diff --git a/crates/ide-diagnostics/src/handlers/missing_match_arms.rs b/crates/ide-diagnostics/src/handlers/missing_match_arms.rs
index 7632fdf1d0..8596f5792e 100644
--- a/crates/ide-diagnostics/src/handlers/missing_match_arms.rs
+++ b/crates/ide-diagnostics/src/handlers/missing_match_arms.rs

@@ -18,7 +18,9 @@ pub(crate) fn missing_match_arms(

#[cfg(test)]

mod tests {

use crate::{

- tests::{check_diagnostics, check_diagnostics_with_config},

+ tests::{

+ check_diagnostics, check_diagnostics_with_config, check_diagnostics_with_disabled,

+ },

DiagnosticsConfig,

};

@@ -282,7 +284,7 @@ fn main() {

cov_mark::check_count!(validate_match_bailed_out, 4);

// Match statements with arms that don't match the

// expression pattern do not fire this diagnostic.

- check_diagnostics(

+ check_diagnostics_with_disabled(

r#"

enum Either { A, B }

enum Either2 { C, D }

@@ -307,6 +309,7 @@ fn main() {

match Unresolved::Bar { Unresolved::Baz => () }

}

"#,

+ &["E0425"],

);

}

@@ -397,11 +400,11 @@ fn main() {

match loop {} {

Either::A => (),

}

- match loop { break Foo::A } {

- //^^^^^^^^^^^^^^^^^^^^^ error: missing match arm: `B` not covered

+ match loop { break Either::A } {

+ //^^^^^^^^^^^^^^^^^^^^^^^^ error: missing match arm: `B` not covered

Either::A => (),

}

- match loop { break Foo::A } {

+ match loop { break Either::A } {

Either::A => (),

Either::B => (),

}

@@ -977,7 +980,7 @@ fn f(ty: Enum) {

#[test]

fn unexpected_ty_fndef() {

cov_mark::check!(validate_match_bailed_out);

- check_diagnostics(

+ check_diagnostics_with_disabled(

enum Exp {

Tuple(()),

@@ -987,6 +990,7 @@ fn f() {

Exp::Tuple => {}

}

}",

+ &["E0425"],

);

}

diff --git a/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs b/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs
index 8310af0f52..d5095b7546 100644
--- a/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs
+++ b/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs

@@ -95,7 +95,7 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &RemoveUnnecessaryElse) -> Option<Vec<

#[cfg(test)]

mod tests {

- use crate::tests::{check_diagnostics, check_diagnostics_with_disabled, check_fix};

+ use crate::tests::{check_diagnostics_with_disabled, check_fix};

#[test]

fn remove_unnecessary_else_for_return() {

@@ -110,7 +110,7 @@ fn test() {

}

"#,

- &["needless_return"],

+ &["needless_return", "E0425"],

);

check_fix(

r#"

@@ -148,7 +148,7 @@ fn test() {

}

"#,

- &["needless_return"],

+ &["needless_return", "E0425"],

);

check_fix(

r#"

@@ -227,7 +227,7 @@ fn test() {

}

"#,

- &["needless_return"],

+ &["needless_return", "E0425"],

);

check_fix(

r#"

@@ -293,7 +293,7 @@ fn test() {

#[test]

fn remove_unnecessary_else_for_break() {

- check_diagnostics(

+ check_diagnostics_with_disabled(

r#"

fn test() {

loop {

@@ -306,6 +306,7 @@ fn test() {

}

"#,

+ &["E0425"],

);

check_fix(

r#"

@@ -334,7 +335,7 @@ fn test() {

#[test]

fn remove_unnecessary_else_for_continue() {

- check_diagnostics(

+ check_diagnostics_with_disabled(

r#"

fn test() {

loop {

@@ -347,6 +348,7 @@ fn test() {

}

"#,

+ &["E0425"],

);

check_fix(

r#"

@@ -375,7 +377,7 @@ fn test() {

#[test]

fn remove_unnecessary_else_for_never() {

- check_diagnostics(

+ check_diagnostics_with_disabled(

r#"

fn test() {

if foo {

@@ -390,6 +392,7 @@ fn never() -> ! {

loop {}

}

"#,

+ &["E0425"],

);

check_fix(

r#"

@@ -422,7 +425,7 @@ fn never() -> ! {

#[test]

fn no_diagnostic_if_no_else_branch() {

- check_diagnostics(

+ check_diagnostics_with_disabled(

r#"

fn test() {

if foo {

@@ -432,12 +435,13 @@ fn test() {

do_something_else();

}

"#,

+ &["E0425"],

);

}

#[test]

fn no_diagnostic_if_no_divergence() {

- check_diagnostics(

+ check_diagnostics_with_disabled(

r#"

fn test() {

if foo {

@@ -447,6 +451,7 @@ fn test() {

}

"#,

+ &["E0425"],

);

}

@@ -462,7 +467,7 @@ fn test() {

}

"#,

- &["needless_return"],

+ &["needless_return", "E0425"],

);

}

diff --git a/crates/ide-diagnostics/src/handlers/undeclared_label.rs b/crates/ide-diagnostics/src/handlers/undeclared_label.rs
index a6a0fdc655..97943b7e8b 100644
--- a/crates/ide-diagnostics/src/handlers/undeclared_label.rs
+++ b/crates/ide-diagnostics/src/handlers/undeclared_label.rs

@@ -38,10 +38,12 @@ fn foo() {

fn while_let_loop_with_label_in_condition() {

check_diagnostics(

r#"

+//- minicore: option

fn foo() {

let mut optional = Some(0);

- 'my_label: while let Some(a) = match optional {

+ 'my_label: while let Some(_) = match optional {

None => break 'my_label,

Some(val) => Some(val),

} {

@@ -59,8 +61,8 @@ fn foo() {

r#"

//- minicore: iterator

fn foo() {

- 'xxx: for _ in unknown {

- 'yyy: for _ in unknown {

+ 'xxx: for _ in [] {

+ 'yyy: for _ in [] {

break 'xxx;

continue 'yyy;

break 'zzz;

diff --git a/crates/ide-diagnostics/src/handlers/unresolved_field.rs b/crates/ide-diagnostics/src/handlers/unresolved_field.rs
index 65abfd8a29..4c01a2d155 100644
--- a/crates/ide-diagnostics/src/handlers/unresolved_field.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_field.rs

@@ -78,7 +78,9 @@ fn method_fix(

#[cfg(test)]

mod tests {

use crate::{

- tests::{check_diagnostics, check_diagnostics_with_config},

+ tests::{

+ check_diagnostics, check_diagnostics_with_config, check_diagnostics_with_disabled,

+ },

DiagnosticsConfig,

};

@@ -148,7 +150,7 @@ fn foo() {

#[test]

fn no_diagnostic_on_unknown() {

- check_diagnostics(

+ check_diagnostics_with_disabled(

r#"

fn foo() {

x.foo;

@@ -156,6 +158,7 @@ fn foo() {

(&((x,),),).foo;

}

"#,

+ &["E0425"],

);

}

diff --git a/crates/ide-diagnostics/src/handlers/unresolved_ident.rs b/crates/ide-diagnostics/src/handlers/unresolved_ident.rs
new file mode 100644
index 0000000000..295c8a2c61
--- /dev/null
+++ b/crates/ide-diagnostics/src/handlers/unresolved_ident.rs

@@ -0,0 +1,46 @@

+use crate::{Diagnostic, DiagnosticCode, DiagnosticsContext};

+// Diagnostic: unresolved-ident

+//

+// This diagnostic is triggered if an expr-position ident is invalid.

+pub(crate) fn unresolved_ident(

+ ctx: &DiagnosticsContext<'_>,

+ d: &hir::UnresolvedIdent,

+) -> Diagnostic {

+ Diagnostic::new_with_syntax_node_ptr(

+ ctx,

+ DiagnosticCode::RustcHardError("E0425"),

+ "no such value in this scope",

+ d.expr.map(Into::into),

+ )

+ .experimental()

+#[cfg(test)]

+mod tests {

+ use crate::tests::check_diagnostics;

+ #[test]

+ fn missing() {

+ check_diagnostics(

+ r#"

+fn main() {

+ let _ = x;

+ //^ error: no such value in this scope

+"#,

+ );

+ }

+ #[test]

+ fn present() {

+ check_diagnostics(

+ r#"

+fn main() {

+ let x = 5;

+ let _ = x;

+"#,

+ );

+ }

diff --git a/crates/ide-diagnostics/src/handlers/unresolved_method.rs b/crates/ide-diagnostics/src/handlers/unresolved_method.rs
index 648d081898..0614fdc551 100644
--- a/crates/ide-diagnostics/src/handlers/unresolved_method.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_method.rs

@@ -335,8 +335,8 @@ fn main() {

r#"

struct Foo { bar: i32 }

fn foo() {

- Foo { bar: i32 }.bar();

- // ^^^ error: no method `bar` on type `Foo`, but a field with a similar name exists

+ Foo { bar: 0 }.bar();

+ // ^^^ error: no method `bar` on type `Foo`, but a field with a similar name exists

}

"#,

);

diff --git a/crates/ide-diagnostics/src/lib.rs b/crates/ide-diagnostics/src/lib.rs
index 3a3888011d..4428b8baaf 100644
--- a/crates/ide-diagnostics/src/lib.rs
+++ b/crates/ide-diagnostics/src/lib.rs

@@ -59,6 +59,7 @@ mod handlers {

pub(crate) mod unresolved_assoc_item;

pub(crate) mod unresolved_extern_crate;

pub(crate) mod unresolved_field;

+ pub(crate) mod unresolved_ident;

pub(crate) mod unresolved_import;

pub(crate) mod unresolved_macro_call;

pub(crate) mod unresolved_method;

@@ -377,6 +378,7 @@ pub fn diagnostics(

AnyDiagnostic::UnresolvedAssocItem(d) => handlers::unresolved_assoc_item::unresolved_assoc_item(&ctx, &d),

AnyDiagnostic::UnresolvedExternCrate(d) => handlers::unresolved_extern_crate::unresolved_extern_crate(&ctx, &d),

AnyDiagnostic::UnresolvedField(d) => handlers::unresolved_field::unresolved_field(&ctx, &d),

+ AnyDiagnostic::UnresolvedIdent(d) => handlers::unresolved_ident::unresolved_ident(&ctx, &d),

AnyDiagnostic::UnresolvedImport(d) => handlers::unresolved_import::unresolved_import(&ctx, &d),

AnyDiagnostic::UnresolvedMacroCall(d) => handlers::unresolved_macro_call::unresolved_macro_call(&ctx, &d),

AnyDiagnostic::UnresolvedMethodCall(d) => handlers::unresolved_method::unresolved_method(&ctx, &d),