bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Refine "remove semicolon" suggestion in trait selection

Browse source 
Don't suggest it if the last statement doesn't have a semicolon

Fixes #81098

See also #54771 for why this suggestion was added
This commit is contained in:
Ömer Sinan Ağacan 2021-01-26 13:10:54 +03:00
parent a8f7075532
commit 8ddc1c83f2
3 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -888,8 +888,10 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
// no return, suggest removal of semicolon on last statement.
// Once that is added, close #54771.
if let Some(ref stmt) = blk.stmts.last() {
let sp = self.tcx.sess.source_map().end_point(stmt.span);
err.span_label(sp, "consider removing this semicolon");
if let hir::StmtKind::Semi(_) = stmt.kind {
let sp = self.tcx.sess.source_map().end_point(stmt.span);
err.span_label(sp, "consider removing this semicolon");
}
}
}
}