aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_ty/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/hir_ty/src')
-rw-r--r--crates/hir_ty/src/diagnostics.rs24
-rw-r--r--crates/hir_ty/src/diagnostics/expr.rs39
2 files changed, 60 insertions, 3 deletions
diff --git a/crates/hir_ty/src/diagnostics.rs b/crates/hir_ty/src/diagnostics.rs
index b58fe0ed7..e59487e54 100644
--- a/crates/hir_ty/src/diagnostics.rs
+++ b/crates/hir_ty/src/diagnostics.rs
@@ -216,6 +216,30 @@ impl Diagnostic for MissingOkInTailExpr {
216 } 216 }
217} 217}
218 218
219#[derive(Debug)]
220pub struct RemoveThisSemicolon {
221 pub file: HirFileId,
222 pub expr: AstPtr<ast::Expr>,
223}
224
225impl Diagnostic for RemoveThisSemicolon {
226 fn code(&self) -> DiagnosticCode {
227 DiagnosticCode("remove-this-semicolon")
228 }
229
230 fn message(&self) -> String {
231 "Remove this semicolon".to_string()
232 }
233
234 fn display_source(&self) -> InFile<SyntaxNodePtr> {
235 InFile { file_id: self.file, value: self.expr.clone().into() }
236 }
237
238 fn as_any(&self) -> &(dyn Any + Send + 'static) {
239 self
240 }
241}
242
219// Diagnostic: break-outside-of-loop 243// Diagnostic: break-outside-of-loop
220// 244//
221// This diagnostic is triggered if `break` keyword is used outside of a loop. 245// This diagnostic is triggered if `break` keyword is used outside of a loop.
diff --git a/crates/hir_ty/src/diagnostics/expr.rs b/crates/hir_ty/src/diagnostics/expr.rs
index 434b19354..849415706 100644
--- a/crates/hir_ty/src/diagnostics/expr.rs
+++ b/crates/hir_ty/src/diagnostics/expr.rs
@@ -2,7 +2,7 @@
2 2
3use std::sync::Arc; 3use std::sync::Arc;
4 4
5use hir_def::{path::path, resolver::HasResolver, AdtId, DefWithBodyId}; 5use hir_def::{expr::Statement, path::path, resolver::HasResolver, AdtId, DefWithBodyId};
6use hir_expand::diagnostics::DiagnosticSink; 6use hir_expand::diagnostics::DiagnosticSink;
7use rustc_hash::FxHashSet; 7use rustc_hash::FxHashSet;
8use syntax::{ast, AstPtr}; 8use syntax::{ast, AstPtr};
@@ -12,6 +12,7 @@ use crate::{
12 diagnostics::{ 12 diagnostics::{
13 match_check::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness}, 13 match_check::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
14 MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields, 14 MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields,
15 RemoveThisSemicolon,
15 }, 16 },
16 utils::variant_data, 17 utils::variant_data,
17 ApplicationTy, InferenceResult, Ty, TypeCtor, 18 ApplicationTy, InferenceResult, Ty, TypeCtor,
@@ -76,8 +77,12 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
76 } 77 }
77 } 78 }
78 let body_expr = &body[body.body_expr]; 79 let body_expr = &body[body.body_expr];
79 if let Expr::Block { tail: Some(t), .. } = body_expr { 80 if let Expr::Block { statements, tail, .. } = body_expr {
80 self.validate_results_in_tail_expr(body.body_expr, *t, db); 81 if let Some(t) = tail {
82 self.validate_results_in_tail_expr(body.body_expr, *t, db);
83 } else if let Some(Statement::Expr(id)) = statements.last() {
84 self.validate_missing_tail_expr(body.body_expr, *id, db);
85 }
81 } 86 }
82 } 87 }
83 88
@@ -317,6 +322,34 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
317 } 322 }
318 } 323 }
319 } 324 }
325
326 fn validate_missing_tail_expr(
327 &mut self,
328 body_id: ExprId,
329 possible_tail_id: ExprId,
330 db: &dyn HirDatabase,
331 ) {
332 let mismatch = match self.infer.type_mismatch_for_expr(body_id) {
333 Some(m) => m,
334 None => return,
335 };
336
337 let possible_tail_ty = match self.infer.type_of_expr.get(possible_tail_id) {
338 Some(ty) => ty,
339 None => return,
340 };
341
342 if mismatch.actual != Ty::unit() || mismatch.expected != *possible_tail_ty {
343 return;
344 }
345
346 let (_, source_map) = db.body_with_source_map(self.owner.into());
347
348 if let Ok(source_ptr) = source_map.expr_syntax(possible_tail_id) {
349 self.sink
350 .push(RemoveThisSemicolon { file: source_ptr.file_id, expr: source_ptr.value });
351 }
352 }
320} 353}
321 354
322pub fn record_literal_missing_fields( 355pub fn record_literal_missing_fields(