Skip to content

Commit

Permalink
Auto merge of #6976 - Jarcho:manual_map_const, r=phansch
Browse files Browse the repository at this point in the history
Don't lint `manual_map` in const functions

fixes: #6967

changelog: Don't lint `manual_map` in const functions
  • Loading branch information
bors committed Apr 1, 2021
2 parents 8cf7d9b + cc7f1da commit 75d73e9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
10 changes: 5 additions & 5 deletions clippy_lints/src/manual_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::{map_unit_fn::OPTION_MAP_UNIT_FN, matches::MATCH_AS_REF};
use clippy_utils::diagnostics::span_lint_and_sugg;
use clippy_utils::source::{snippet_with_applicability, snippet_with_context};
use clippy_utils::ty::{can_partially_move_ty, is_type_diagnostic_item, peel_mid_ty_refs_is_mutable};
use clippy_utils::{is_allowed, is_else_clause, match_def_path, match_var, paths, peel_hir_expr_refs};
use clippy_utils::{in_constant, is_allowed, is_else_clause, match_def_path, match_var, paths, peel_hir_expr_refs};
use rustc_ast::util::parser::PREC_POSTFIX;
use rustc_errors::Applicability;
use rustc_hir::{
Expand Down Expand Up @@ -47,16 +47,16 @@ declare_lint_pass!(ManualMap => [MANUAL_MAP]);
impl LateLintPass<'_> for ManualMap {
#[allow(clippy::too_many_lines)]
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
if in_external_macro(cx.sess(), expr.span) {
return;
}

if let ExprKind::Match(
scrutinee,
[arm1 @ Arm { guard: None, .. }, arm2 @ Arm { guard: None, .. }],
match_kind,
) = expr.kind
{
if in_external_macro(cx.sess(), expr.span) || in_constant(cx, expr.hir_id) {
return;
}

let (scrutinee_ty, ty_ref_count, ty_mutability) =
peel_mid_ty_refs_is_mutable(cx.typeck_results().expr_ty(scrutinee));
if !(is_type_diagnostic_item(cx, scrutinee_ty, sym::option_type)
Expand Down
8 changes: 8 additions & 0 deletions tests/ui/manual_map_option.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,12 @@ fn main() {
if true {
Some(0)
} else { Some(0).map(|x| x + 1) };

// #6967
const fn f4() {
match Some(0) {
Some(x) => Some(x + 1),
None => None,
};
}
}
8 changes: 8 additions & 0 deletions tests/ui/manual_map_option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,12 @@ fn main() {
} else {
None
};

// #6967
const fn f4() {
match Some(0) {
Some(x) => Some(x + 1),
None => None,
};
}
}

0 comments on commit 75d73e9

Please sign in to comment.