Skip to content

Commit 5f95610

Browse files
committed
Fix patterns of the constants that are const meth
See the regression test for the sample code this fixes
1 parent 8da2bca commit 5f95610

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

src/librustc_const_eval/eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ pub fn const_expr_to_pat(tcx: &ty::TyCtxt, expr: &Expr, pat_id: ast::NodeId, spa
281281
let path = match def.full_def() {
282282
Def::Struct(def_id) => def_to_path(tcx, def_id),
283283
Def::Variant(_, variant_did) => def_to_path(tcx, variant_did),
284-
Def::Fn(..) => return Ok(P(hir::Pat {
284+
Def::Fn(..) | Def::Method(..) => return Ok(P(hir::Pat {
285285
id: expr.id,
286286
node: PatKind::Lit(P(expr.clone())),
287287
span: span,
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
#![feature(const_fn)]
11+
12+
struct A;
13+
14+
impl A {
15+
const fn banana() -> bool {
16+
true
17+
}
18+
}
19+
20+
const ABANANA: bool = A::banana();
21+
22+
fn main() {
23+
match true {
24+
ABANANA => {},
25+
_ => panic!("what?")
26+
}
27+
}

0 commit comments

Comments
 (0)