Skip to content

Commit

Permalink
eval_const_expr_partial now returns ConstVal::Struct instead of None …
Browse files Browse the repository at this point in the history
…for unit-struct path expressions. Fixes #27008
  • Loading branch information
Detegr committed Jul 23, 2015
1 parent 7911d99 commit e981311
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/librustc/middle/const_eval.rs
Expand Up @@ -967,6 +967,9 @@ pub fn eval_const_expr_partial<'tcx>(tcx: &ty::ctxt<'tcx>,
Some(def::DefVariant(enum_def, variant_def, _)) => {
(lookup_variant_by_id(tcx, enum_def, variant_def), None)
}
Some(def::DefStruct(_)) => {
return Ok(ConstVal::Struct(e.id))
}
_ => (None, None)
};
let const_expr = match const_expr {
Expand Down
21 changes: 21 additions & 0 deletions src/test/compile-fail/issue-27008.rs
@@ -0,0 +1,21 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

struct S;

fn main() {
let b = [0; S];
//~^ ERROR mismatched types
//~| expected `usize`
//~| found `S`
//~| expected usize
//~| found struct `S`
//~| ERROR expected positive integer for repeat count, found struct
}

0 comments on commit e981311

Please sign in to comment.