Auto merge of #26848 - oli-obk:const_fn_const_eval, r=pnkfelix

[rust.git] / src / librustc / middle / check_match.rs

diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs
index 1548a3aed4bd8c381ec3ab9bf31302afb719e8ee..f8786c7daaa80adf5fd9d7837d3f17de9b2376f1 100644 (file)
--- a/src/librustc/middle/check_match.rs
+++ b/src/librustc/middle/check_match.rs
@@ -272,7 +272,7 @@ fn check_for_bindings_named_the_same_as_variants(cx: &MatchCheckCtxt, pat: &Pat)
 fn check_for_static_nan(cx: &MatchCheckCtxt, pat: &Pat) {
     front_util::walk_pat(pat, |p| {
         if let hir::PatLit(ref expr) = p.node {
-            match eval_const_expr_partial(cx.tcx, &**expr, ExprTypeChecked) {
+            match eval_const_expr_partial(cx.tcx, &**expr, ExprTypeChecked, None) {
                 Ok(ConstVal::Float(f)) if f.is_nan() => {
                     span_warn!(cx.tcx.sess, p.span, E0003,
                                "unmatchable NaN in pattern, \