nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-27 07:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3496 from fkohlgrueber/macro-in-closure-in-if-cond

Browse Source 
fix #3482 and add ui test for it
This commit is contained in:
Oliver S̶c̶h̶n̶e̶i̶d̶e̶r Scherer 2018-12-06 12:26:43 +01:00 committed by GitHub
commit 0fb30218d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/block_in_if_condition.rs
View File

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

8
tests/ui/block_in_if_condition.rs
View File

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