bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Formatting.

Browse source
This commit is contained in:
Mara Bos 2020-10-18 23:25:57 +02:00
parent ded269fa10
commit b8a8b681b8
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_lint/src/panic_fmt.rs
View file

@ -53,7 +53,7 @@ fn check_panic<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>, arg: &'tc
let looks_like_placeholder = match (open, close) { let looks_like_placeholder = match (open, close) {
(Some(_), Some(_)) => true, (Some(_), Some(_)) => true,
(Some(_), None) | (None, Some(_)) => false, (Some(_), None) | (None, Some(_)) => false,
(None, None) => return // OK, no braces. (None, None) => return, // OK, no braces.
}; };
let expn = f.span.ctxt().outer_expn_data(); let expn = f.span.ctxt().outer_expn_data();
if let Some(id) = expn.macro_def_id { if let Some(id) = expn.macro_def_id {
@ -64,9 +64,10 @@ fn check_panic<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>, arg: &'tc
// Unwrap another level of macro expansion if this // Unwrap another level of macro expansion if this
// panic!() was expanded from assert!(). // panic!() was expanded from assert!().
let parent = expn.call_site.ctxt().outer_expn_data(); let parent = expn.call_site.ctxt().outer_expn_data();
if parent.macro_def_id.map_or(false, |id| { if parent
cx.tcx.is_diagnostic_item(sym::assert_macro, id) .macro_def_id
}) { .map_or(false, |id| cx.tcx.is_diagnostic_item(sym::assert_macro, id))
{
parent parent
} else { } else {
expn expn