mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small code style adjustments

Browse Source
This commit is contained in:
Niki4tap 2022-12-23 00:56:50 +03:00
parent 4fe3727c39
commit 0cd9b06125
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
clippy_lints/src/returns.rs
View File

@ -210,22 +210,25 @@ fn check_final_expr<'tcx>(
// if desugar of `do yeet`, don't lint // if desugar of `do yeet`, don't lint
if let Some(inner_expr) = inner if let Some(inner_expr) = inner
&& let ExprKind::Call(path_expr, _) = inner_expr.kind && let ExprKind::Call(path_expr, _) = inner_expr.kind
&& let ExprKind::Path(QPath::LangItem(LangItem::TryTraitFromYeet, _, _)) = path_expr.kind { && let ExprKind::Path(QPath::LangItem(LangItem::TryTraitFromYeet, _, _)) = path_expr.kind
return; {
return;
} }
if cx.tcx.hir().attrs(expr.hir_id).is_empty() { if !cx.tcx.hir().attrs(expr.hir_id).is_empty() {
let borrows = inner.map_or(false, |inner| last_statement_borrows(cx, inner)); return;
if !borrows { }
// check if expr return nothing let borrows = inner.map_or(false, |inner| last_statement_borrows(cx, inner));
let ret_span = if inner.is_none() && replacement == RetReplacement::Empty { if borrows {
extend_span_to_previous_non_ws(cx, peeled_drop_expr.span) return;
} else { }
peeled_drop_expr.span // check if expr return nothing
}; let ret_span = if inner.is_none() && replacement == RetReplacement::Empty {
extend_span_to_previous_non_ws(cx, peeled_drop_expr.span)
} else {
peeled_drop_expr.span
};
emit_return_lint(cx, ret_span, semi_spans, inner.as_ref().map(|i| i.span), replacement); emit_return_lint(cx, ret_span, semi_spans, inner.as_ref().map(|i| i.span), replacement);
}
}
}, },
ExprKind::If(_, then, else_clause_opt) => { ExprKind::If(_, then, else_clause_opt) => {
check_block_return(cx, &then.kind, semi_spans.clone()); check_block_return(cx, &then.kind, semi_spans.clone());