about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver S̶c̶h̶n̶e̶i̶d̶e̶r Scherer <github35764891676564198441@oli-obk.de>2018-10-17 09:04:10 +0200
committerGitHub <noreply@github.com>2018-10-17 09:04:10 +0200
commit38f3ad41c0bbf6ed7c389a070afb60a465b3afe3 (patch)
treeee3fae0f0342959b556b3193febb5963c1ab5029
parent007390c21cc5e5e8705d455d20fba1df13bd7362 (diff)
downloadrust-38f3ad41c0bbf6ed7c389a070afb60a465b3afe3.tar.gz
rust-38f3ad41c0bbf6ed7c389a070afb60a465b3afe3.zip
Squash closure cast error into fn ptr cast error
-rw-r--r--src/librustc_mir/transform/qualify_min_const_fn.rs5
1 files changed, 1 insertions, 4 deletions
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(),