diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-05-05 08:47:04 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-05-21 11:47:30 -0400 |
| commit | df93deab10850d52252829770895b0249b0d7f1e (patch) | |
| tree | 4e8a7657c0d2714319800a07c485bff473043bad /src/test/compile-fail/check-static-values-constraints.rs | |
| parent | fb206bf34a2463317b9fa1ef3c0ff35d921f8920 (diff) | |
| download | rust-df93deab10850d52252829770895b0249b0d7f1e.tar.gz rust-df93deab10850d52252829770895b0249b0d7f1e.zip | |
Make various fixes:
- add feature gate - add basic tests - adjust parser to eliminate conflict between `const fn` and associated constants - allow `const fn` in traits/trait-impls, but forbid later in type check - correct some merge conflicts
Diffstat (limited to 'src/test/compile-fail/check-static-values-constraints.rs')
| -rw-r--r-- | src/test/compile-fail/check-static-values-constraints.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/compile-fail/check-static-values-constraints.rs b/src/test/compile-fail/check-static-values-constraints.rs index 0180bccbca4..c3a1de11752 100644 --- a/src/test/compile-fail/check-static-values-constraints.rs +++ b/src/test/compile-fail/check-static-values-constraints.rs @@ -117,7 +117,7 @@ static mut STATIC14: SafeStruct = SafeStruct { //~^ ERROR mutable statics are not allowed to have destructors field1: SafeEnum::Variant1, field2: SafeEnum::Variant4("str".to_string()) -//~^ ERROR static contains unimplemented expression type +//~^ ERROR method calls in statics are limited to constant inherent methods }; static STATIC15: &'static [Box<MyOwned>] = &[ |