From 65778fa5e886c641422501e68ec7ffbe690abafc Mon Sep 17 00:00:00 2001
From: Takayuki <takoyaki0316@gmail.com>
Date: Thu, 22 Apr 2021 16:52:34 +0900
Subject: [PATCH 1/2] fix a false-positive inside const fn in comparison_chain

---
 clippy_lints/src/comparison_chain.rs | 14 +++++++++++++-
 tests/ui/comparison_chain.rs         | 28 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/clippy_lints/src/comparison_chain.rs b/clippy_lints/src/comparison_chain.rs
index 42e153909ce7..150d8a3d6739 100644
--- a/clippy_lints/src/comparison_chain.rs
+++ b/clippy_lints/src/comparison_chain.rs
@@ -1,7 +1,7 @@
 use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::ty::implements_trait;
 use clippy_utils::{get_trait_def_id, if_sequence, is_else_clause, paths, SpanlessEq};
-use rustc_hir::{BinOpKind, Expr, ExprKind};
+use rustc_hir::{BinOpKind, Expr, ExprKind, Node};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::{declare_lint_pass, declare_tool_lint};
 
@@ -64,6 +64,10 @@ impl<'tcx> LateLintPass<'tcx> for ComparisonChain {
             return;
         }
 
+        if parent_node_is_if_const_fn(cx, expr) {
+            return;
+        }
+
         // Check that there exists at least one explicit else condition
         let (conds, _) = if_sequence(expr);
         if conds.len() < 2 {
@@ -123,3 +127,11 @@ impl<'tcx> LateLintPass<'tcx> for ComparisonChain {
 fn kind_is_cmp(kind: BinOpKind) -> bool {
     matches!(kind, BinOpKind::Lt | BinOpKind::Gt | BinOpKind::Eq)
 }
+
+fn parent_node_is_if_const_fn(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
+    match cx.tcx.hir().find(cx.tcx.hir().get_parent_item(expr.hir_id)) {
+        Some(Node::Item(item)) => rustc_mir::const_eval::is_const_fn(cx.tcx, item.def_id.to_def_id()),
+        Some(Node::ImplItem(impl_item)) => rustc_mir::const_eval::is_const_fn(cx.tcx, impl_item.def_id.to_def_id()),
+        _ => false,
+    }
+}
diff --git a/tests/ui/comparison_chain.rs b/tests/ui/comparison_chain.rs
index 3b03f8c7dfe7..c12c6a310275 100644
--- a/tests/ui/comparison_chain.rs
+++ b/tests/ui/comparison_chain.rs
@@ -203,4 +203,32 @@ mod issue_5212 {
     }
 }
 
+enum Sign {
+    Negative,
+    Positive,
+    Zero,
+}
+
+impl Sign {
+    const fn sign_i8(n: i8) -> Self {
+        if n == 0 {
+            Sign::Zero
+        } else if n > 0 {
+            Sign::Positive
+        } else {
+            Sign::Negative
+        }
+    }
+}
+
+const fn sign_i8(n: i8) -> Sign {
+    if n == 0 {
+        Sign::Zero
+    } else if n > 0 {
+        Sign::Positive
+    } else {
+        Sign::Negative
+    }
+}
+
 fn main() {}

From 0dff377a62b3ae24ceb88ff0a9070f3a4e3d5552 Mon Sep 17 00:00:00 2001
From: Takayuki <takoyaki0316@gmail.com>
Date: Fri, 30 Apr 2021 14:40:35 +0900
Subject: [PATCH 2/2] use `in_constant`

---
 clippy_lints/src/comparison_chain.rs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/clippy_lints/src/comparison_chain.rs b/clippy_lints/src/comparison_chain.rs
index 150d8a3d6739..2a61d58e6537 100644
--- a/clippy_lints/src/comparison_chain.rs
+++ b/clippy_lints/src/comparison_chain.rs
@@ -1,7 +1,7 @@
 use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::ty::implements_trait;
-use clippy_utils::{get_trait_def_id, if_sequence, is_else_clause, paths, SpanlessEq};
-use rustc_hir::{BinOpKind, Expr, ExprKind, Node};
+use clippy_utils::{get_trait_def_id, if_sequence, in_constant, is_else_clause, paths, SpanlessEq};
+use rustc_hir::{BinOpKind, Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::{declare_lint_pass, declare_tool_lint};
 
@@ -64,7 +64,7 @@ impl<'tcx> LateLintPass<'tcx> for ComparisonChain {
             return;
         }
 
-        if parent_node_is_if_const_fn(cx, expr) {
+        if in_constant(cx, expr.hir_id) {
             return;
         }
 
@@ -127,11 +127,3 @@ impl<'tcx> LateLintPass<'tcx> for ComparisonChain {
 fn kind_is_cmp(kind: BinOpKind) -> bool {
     matches!(kind, BinOpKind::Lt | BinOpKind::Gt | BinOpKind::Eq)
 }
-
-fn parent_node_is_if_const_fn(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
-    match cx.tcx.hir().find(cx.tcx.hir().get_parent_item(expr.hir_id)) {
-        Some(Node::Item(item)) => rustc_mir::const_eval::is_const_fn(cx.tcx, item.def_id.to_def_id()),
-        Some(Node::ImplItem(impl_item)) => rustc_mir::const_eval::is_const_fn(cx.tcx, impl_item.def_id.to_def_id()),
-        _ => false,
-    }
-}