bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Replace option.map(cond) == Some(true) with option.is_some_and(cond)

Browse source
This commit is contained in:
David Tolnay 2023-11-24 08:49:37 -08:00
parent beebcdeb6f
commit 8cc7073d64
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
8 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_lint/src/non_fmt_panic.rs
View file

@ -154,17 +154,13 @@ fn check_panic<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>, arg: &'tc
let infcx = cx.tcx.infer_ctxt().build();
let suggest_display = is_str
|| cx
.tcx
.get_diagnostic_item(sym::Display)
.map(|t| infcx.type_implements_trait(t, [ty], cx.param_env).may_apply())
== Some(true);
|| cx.tcx.get_diagnostic_item(sym::Display).is_some_and(|t| {
infcx.type_implements_trait(t, [ty], cx.param_env).may_apply()
});
let suggest_debug = !suggest_display
&& cx
.tcx
.get_diagnostic_item(sym::Debug)
.map(|t| infcx.type_implements_trait(t, [ty], cx.param_env).may_apply())
== Some(true);
&& cx.tcx.get_diagnostic_item(sym::Debug).is_some_and(|t| {
infcx.type_implements_trait(t, [ty], cx.param_env).may_apply()
});
let suggest_panic_any = !is_str && panic == sym::std_panic_macro;