nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats 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) {
(Some(_), Some(_)) => true,
(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();
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
// panic!() was expanded from assert!().
let parent = expn.call_site.ctxt().outer_expn_data();
if parent.macro_def_id.map_or(false, |id| {
cx.tcx.is_diagnostic_item(sym::assert_macro, id)
}) {
if parent
.macro_def_id
.map_or(false, |id| cx.tcx.is_diagnostic_item(sym::assert_macro, id))
{
parent
} else {
expn