bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

refactor: use is_lang_ctor()

Browse source
This commit is contained in:
Max Baumann 2022-03-20 23:54:04 +01:00
parent 0f83753934
commit 4580c8a9b7
No known key found for this signature in database
GPG key ID: 20FA1609B03B1D6D
1 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
clippy_lints/src/methods/or_then_unwrap.rs
View file

@ -1,9 +1,8 @@
use clippy_utils::diagnostics::span_lint_and_sugg;
use clippy_utils::source::snippet_with_applicability; use clippy_utils::source::snippet_with_applicability;
use clippy_utils::ty::is_type_diagnostic_item; use clippy_utils::ty::is_type_diagnostic_item;
use if_chain::if_chain; use clippy_utils::{diagnostics::span_lint_and_sugg, is_lang_ctor};
use rustc_errors::Applicability; use rustc_errors::Applicability;
use rustc_hir::{Expr, ExprKind, QPath}; use rustc_hir::{lang_items::LangItem, Expr, ExprKind};
use rustc_lint::LateContext; use rustc_lint::LateContext;
use rustc_span::{sym, Span}; use rustc_span::{sym, Span};
@ -22,14 +21,14 @@ pub(super) fn check<'tcx>(
if is_type_diagnostic_item(cx, ty, sym::Option) { if is_type_diagnostic_item(cx, ty, sym::Option) {
title = "found `.or(Some(…)).unwrap()`"; title = "found `.or(Some(…)).unwrap()`";
if let Some(content) = get_content_if_is(or_arg, "Some") { if let Some(content) = get_content_if_ctor_matches(cx, or_arg, LangItem::OptionSome) {
or_arg_content = content; or_arg_content = content;
} else { } else {
return; return;
} }
} else if is_type_diagnostic_item(cx, ty, sym::Result) { } else if is_type_diagnostic_item(cx, ty, sym::Result) {
title = "found `.or(Ok(…)).unwrap()`"; title = "found `.or(Ok(…)).unwrap()`";
if let Some(content) = get_content_if_is(or_arg, "Ok") { if let Some(content) = get_content_if_ctor_matches(cx, or_arg, LangItem::ResultOk) {
or_arg_content = content; or_arg_content = content;
} else { } else {
return; return;
@ -64,19 +63,13 @@ pub(super) fn check<'tcx>(
); );
} }
/// is expr a Call to name? if so, return what it's wrapping fn get_content_if_ctor_matches(cx: &LateContext<'_>, expr: &Expr<'_>, item: LangItem) -> Option<Span> {
/// name might be "Some", "Ok", "Err", etc. if let ExprKind::Call(some_expr, [arg]) = expr.kind
fn get_content_if_is<'a>(expr: &Expr<'a>, name: &str) -> Option<Span> { && let ExprKind::Path(qpath) = &some_expr.kind
if_chain! { && is_lang_ctor(cx, qpath, item)
if let ExprKind::Call(some_expr, [arg]) = expr.kind; {
if let ExprKind::Path(QPath::Resolved(_, path)) = &some_expr.kind; Some(arg.span)
if let Some(path_segment) = path.segments.first(); } else {
if path_segment.ident.name.as_str() == name; None
then {
Some(arg.span)
}
else {
None
}
} }
} }