From: Oliver S̶c̶h̶n̶e̶i̶d̶e̶r Scherer <github35764891676564198441@oli-obk.de>
Date: Wed, 17 Oct 2018 07:04:10 +0000 (+0200)
Subject: Squash closure cast error into fn ptr cast error
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=38f3ad41c0bbf6ed7c389a070afb60a465b3afe3;p=rust.git

Squash closure cast error into fn ptr cast error
---

diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs
index c9d48f5f6ad..52c557b83d5 100644
--- a/src/librustc_mir/transform/qualify_min_const_fn.rs
+++ b/src/librustc_mir/transform/qualify_min_const_fn.rs
@@ -164,14 +164,11 @@ fn check_rvalue(
             }
         }
         Rvalue::Cast(CastKind::UnsafeFnPointer, _, _) |
+        Rvalue::Cast(CastKind::ClosureFnPointer, _, _) |
         Rvalue::Cast(CastKind::ReifyFnPointer, _, _) => Err((
             span,
             "function pointer casts are not allowed in const fn".into(),
         )),
-        Rvalue::Cast(CastKind::ClosureFnPointer, _, _) => Err((
-            span,
-            "closures are not allowed in const fn".into(),
-        )),
         Rvalue::Cast(CastKind::Unsize, _, _) => Err((
             span,
             "unsizing casts are not allowed in const fn".into(),