Skip to content

Commit

Permalink
Auto merge of #46570 - AgustinCB:issue-46553, r=oli-obk
Browse files Browse the repository at this point in the history
Ignore `unsopported constant expr` error

Fixes #46553
  • Loading branch information
bors committed Dec 12, 2017
2 parents 6a36019 + cbd25ed commit 442b7bd
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/librustc_passes/consts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ impl<'a, 'gcx> CheckCrateVisitor<'a, 'gcx> {
IndexOpFeatureGated => {}
ErroneousReferencedConstant(_) => {}
TypeckError => {}
MiscCatchAll => {}
_ => {
self.tcx.lint_node(CONST_ERR,
expr.id,
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/issue-7364.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ use std::cell::RefCell;
static boxed: Box<RefCell<isize>> = box RefCell::new(0);
//~^ ERROR allocations are not allowed in statics
//~| ERROR `std::cell::RefCell<isize>: std::marker::Sync` is not satisfied
//~| WARN unsupported constant expr

fn main() { }
1 change: 0 additions & 1 deletion src/test/compile-fail/static-mut-not-constant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@

static mut a: Box<isize> = box 3;
//~^ ERROR allocations are not allowed in statics
//~| WARN: constant evaluation error

fn main() {}
32 changes: 32 additions & 0 deletions src/test/run-pass/issue-46553.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright 2017 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.

#![feature(const_fn)]
#![deny(const_err)]

pub struct Data<T> {
function: fn() -> T,
}

impl<T> Data<T> {
pub const fn new(function: fn() -> T) -> Data<T> {
Data {
function: function,
}
}
}

pub static DATA: Data<i32> = Data::new(|| {
413i32
});

fn main() {
print!("{:?}", (DATA.function)());
}

0 comments on commit 442b7bd

Please sign in to comment.