fix #3482 and add ui test for it

This commit is contained in:
Felix Kohlgrüber 2018-12-06 11:07:10 +01:00
parent f93591294d
commit a8a0b236b5
2 changed files with 9 additions and 1 deletions

View File

@ -70,7 +70,7 @@ impl<'a, 'tcx: 'a> Visitor<'tcx> for ExVisitor<'a, 'tcx> {
if let ExprKind::Closure(_, _, eid, _, _) = expr.node {
let body = self.cx.tcx.hir.body(eid);
let ex = &body.value;
if matches!(ex.node, ExprKind::Block(_, _)) {
if matches!(ex.node, ExprKind::Block(_, _)) && !in_macro(body.value.span) {
self.found_block = Some(ex);
return;
}

View File

@ -98,3 +98,11 @@ fn condition_is_unsafe_block() {
fn main() {
}
fn macro_in_closure() {
let option = Some(true);
if option.unwrap_or_else(|| unimplemented!()) {
unimplemented!()
}
}