bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #104433 - TaKO8Ki:fix-104392, r=estebank

Browse source 
Fix `emit_unused_delims_expr` ICE

Fixes #104392
This commit is contained in:
Matthias Krüger 2022-11-17 22:33:18 +01:00 • committed by GitHub
commit c9ccb0ba28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_lint/src/unused.rs
View file

@ -533,16 +533,14 @@ trait UnusedDelimLint {
right_pos: Option<BytePos>,
) {
let spans = match value.kind {
ast::ExprKind::Block(ref block, None) if block.stmts.len() > 0 => {
let start = block.stmts[0].span;
let end = block.stmts[block.stmts.len() - 1].span;
if let Some(start) = start.find_ancestor_inside(value.span)
&& let Some(end) = end.find_ancestor_inside(value.span)
ast::ExprKind::Block(ref block, None) if block.stmts.len() == 1 => {
if let StmtKind::Expr(expr) = &block.stmts[0].kind
&& let ExprKind::Err = expr.kind
{
Some((
value.span.with_hi(start.lo()),
value.span.with_lo(end.hi()),
))
return
}
if let Some(span) = block.stmts[0].span.find_ancestor_inside(value.span) {
Some((value.span.with_hi(span.lo()), value.span.with_lo(span.hi())))
} else {
None
}