+use clippy_utils::diagnostics::span_lint_and_sugg;
+use clippy_utils::is_lang_ctor;
+use clippy_utils::source::snippet_with_applicability;
+use clippy_utils::sugg::Sugg;
+use clippy_utils::ty::is_type_diagnostic_item;
+use clippy_utils::{eq_expr_value, path_to_local_id};
use if_chain::if_chain;
use rustc_errors::Applicability;
-use rustc_hir::def::{DefKind, Res};
-use rustc_hir::{def, BindingAnnotation, Block, Expr, ExprKind, MatchSource, PatKind, StmtKind};
+use rustc_hir::LangItem::{OptionNone, OptionSome};
+use rustc_hir::{BindingAnnotation, Block, Expr, ExprKind, MatchSource, PatKind, StmtKind};
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
-
-use crate::utils::sugg::Sugg;
-use crate::utils::{
- higher, is_type_diagnostic_item, match_def_path, match_qpath, paths, snippet_with_applicability,
- span_lint_and_sugg, SpanlessEq,
-};
+use rustc_span::sym;
declare_clippy_lint! {
/// **What it does:** Checks for expressions that could be replaced by the question mark operator.
/// ```
///
/// If it matches, it will suggest to use the question mark operator instead
- fn check_is_none_and_early_return_none(cx: &LateContext<'_, '_>, expr: &Expr<'_>) {
+ fn check_is_none_and_early_return_none(cx: &LateContext<'_>, expr: &Expr<'_>) {
if_chain! {
- if let Some((if_expr, body, else_)) = higher::if_block(&expr);
+ if let ExprKind::If(if_expr, body, else_) = &expr.kind;
if let ExprKind::MethodCall(segment, _, args, _) = &if_expr.kind;
if segment.ident.name == sym!(is_none);
if Self::expression_returns_none(cx, body);
if let ExprKind::Block(block, None) = &else_.kind;
if block.stmts.is_empty();
if let Some(block_expr) = &block.expr;
- if SpanlessEq::new(cx).ignore_fn().eq_expr(subject, block_expr);
+ if eq_expr_value(cx, subject, block_expr);
then {
replacement = Some(format!("Some({}?)", receiver_str));
}
}
}
- fn check_if_let_some_and_early_return_none(cx: &LateContext<'_, '_>, expr: &Expr<'_>) {
+ fn check_if_let_some_and_early_return_none(cx: &LateContext<'_>, expr: &Expr<'_>) {
if_chain! {
if let ExprKind::Match(subject, arms, source) = &expr.kind;
if *source == MatchSource::IfLetDesugar { contains_else_clause: true };
if Self::is_option(cx, subject);
if let PatKind::TupleStruct(path1, fields, None) = &arms[0].pat.kind;
- if match_qpath(path1, &["Some"]);
- if let PatKind::Binding(annot, _, bind, _) = &fields[0].kind;
+ if is_lang_ctor(cx, path1, OptionSome);
+ if let PatKind::Binding(annot, bind_id, _, _) = fields[0].kind;
let by_ref = matches!(annot, BindingAnnotation::Ref | BindingAnnotation::RefMut);
if let ExprKind::Block(block, None) = &arms[0].body.kind;
if block.stmts.is_empty();
if let Some(trailing_expr) = &block.expr;
- if let ExprKind::Path(path) = &trailing_expr.kind;
- if match_qpath(path, &[&bind.as_str()]);
+ if path_to_local_id(trailing_expr, bind_id);
if let PatKind::Wild = arms[1].pat.kind;
if Self::expression_returns_none(cx, arms[1].body);
}
}
- fn moves_by_default(cx: &LateContext<'_, '_>, expression: &Expr<'_>) -> bool {
- let expr_ty = cx.tables.expr_ty(expression);
+ fn moves_by_default(cx: &LateContext<'_>, expression: &Expr<'_>) -> bool {
+ let expr_ty = cx.typeck_results().expr_ty(expression);
- !expr_ty.is_copy_modulo_regions(cx.tcx, cx.param_env, expression.span)
+ !expr_ty.is_copy_modulo_regions(cx.tcx.at(expression.span), cx.param_env)
}
- fn is_option(cx: &LateContext<'_, '_>, expression: &Expr<'_>) -> bool {
- let expr_ty = cx.tables.expr_ty(expression);
+ fn is_option(cx: &LateContext<'_>, expression: &Expr<'_>) -> bool {
+ let expr_ty = cx.typeck_results().expr_ty(expression);
- is_type_diagnostic_item(cx, expr_ty, sym!(option_type))
+ is_type_diagnostic_item(cx, expr_ty, sym::option_type)
}
- fn expression_returns_none(cx: &LateContext<'_, '_>, expression: &Expr<'_>) -> bool {
+ fn expression_returns_none(cx: &LateContext<'_>, expression: &Expr<'_>) -> bool {
match expression.kind {
- ExprKind::Block(ref block, _) => {
+ ExprKind::Block(block, _) => {
if let Some(return_expression) = Self::return_expression(block) {
- return Self::expression_returns_none(cx, &return_expression);
- }
-
- false
- },
- ExprKind::Ret(Some(ref expr)) => Self::expression_returns_none(cx, expr),
- ExprKind::Path(ref qp) => {
- if let Res::Def(DefKind::Ctor(def::CtorOf::Variant, def::CtorKind::Const), def_id) =
- cx.tables.qpath_res(qp, expression.hir_id)
- {
- return match_def_path(cx, def_id, &paths::OPTION_NONE);
+ return Self::expression_returns_none(cx, return_expression);
}
false
},
+ ExprKind::Ret(Some(expr)) => Self::expression_returns_none(cx, expr),
+ ExprKind::Path(ref qpath) => is_lang_ctor(cx, qpath, OptionNone),
_ => false,
}
}
if_chain! {
if block.stmts.len() == 1;
if let Some(expr) = block.stmts.iter().last();
- if let StmtKind::Semi(ref expr) = expr.kind;
- if let ExprKind::Ret(ret_expr) = expr.kind;
- if let Some(ret_expr) = ret_expr;
+ if let StmtKind::Semi(expr) = expr.kind;
+ if let ExprKind::Ret(Some(ret_expr)) = expr.kind;
then {
return Some(ret_expr);
}
}
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for QuestionMark {
- fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr<'_>) {
+impl<'tcx> LateLintPass<'tcx> for QuestionMark {
+ fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
Self::check_is_none_and_early_return_none(cx, expr);
Self::check_if_let_some_and_early_return_none(cx, expr);
}
projects / rust.git / blobdiff