OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Drop a few unneeded borrows

Browse Source
This commit is contained in:
LingMan 2021-01-15 21:29:28 +01:00
parent e48eb37b94
commit ba1f036c7a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_typeck/src/check/fn_ctxt/checks.rs
View File

@ -813,10 +813,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
if ty.is_never() { if ty.is_never() {
None None
} else { } else {
Some(match &elem.kind { Some(match elem.kind {
// Point at the tail expression when possible. // Point at the tail expression when possible.
hir::ExprKind::Block(block, _) => { hir::ExprKind::Block(block, _) => {
block.expr.as_ref().map_or(block.span, |e| e.span) block.expr.map_or(block.span, |e| e.span)
} }
_ => elem.span, _ => elem.span,
}) })
@ -824,14 +824,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}) })
}; };
if let hir::ExprKind::If(_, _, Some(el)) = &expr.kind { if let hir::ExprKind::If(_, _, Some(el)) = expr.kind {
if let Some(rslt) = check_in_progress(el) { if let Some(rslt) = check_in_progress(el) {
return rslt; return rslt;
} }
} }
if let hir::ExprKind::Match(_, arms, _) = &expr.kind { if let hir::ExprKind::Match(_, arms, _) = expr.kind {
let mut iter = arms.iter().filter_map(|arm| check_in_progress(&arm.body)); let mut iter = arms.iter().filter_map(|arm| check_in_progress(arm.body));
if let Some(span) = iter.next() { if let Some(span) = iter.next() {
if iter.next().is_none() { if iter.next().is_none() {
return span; return span;