Implement RFC 1440 "Allow Drop types in statics/const functions".
This commit is contained in:
parent
4f5900aefa
commit
ed66fe48e9
6 changed files with 54 additions and 23 deletions
|
|
@ -37,7 +37,7 @@ static STATIC2: SafeEnum = SafeEnum::Variant2(0);
|
|||
|
||||
// This one should fail
|
||||
static STATIC3: SafeEnum = SafeEnum::Variant3(WithDtor);
|
||||
//~^ ERROR statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
|
||||
// This enum will be used to test that variants
|
||||
|
|
@ -54,9 +54,9 @@ impl Drop for UnsafeEnum {
|
|||
|
||||
|
||||
static STATIC4: UnsafeEnum = UnsafeEnum::Variant5;
|
||||
//~^ ERROR statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
static STATIC5: UnsafeEnum = UnsafeEnum::Variant6(0);
|
||||
//~^ ERROR statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
|
||||
struct SafeStruct {
|
||||
|
|
@ -71,7 +71,7 @@ static STATIC6: SafeStruct = SafeStruct{field1: SafeEnum::Variant1, field2: Safe
|
|||
// field2 has an unsafe value, hence this should fail
|
||||
static STATIC7: SafeStruct = SafeStruct{field1: SafeEnum::Variant1,
|
||||
field2: SafeEnum::Variant3(WithDtor)};
|
||||
//~^ ERROR statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
// Test variadic constructor for structs. The base struct should be examined
|
||||
// as well as every field present in the constructor.
|
||||
|
|
@ -84,7 +84,7 @@ static STATIC8: SafeStruct = SafeStruct{field1: SafeEnum::Variant1,
|
|||
static STATIC9: SafeStruct = SafeStruct{field1: SafeEnum::Variant1,
|
||||
..SafeStruct{field1: SafeEnum::Variant3(WithDtor),
|
||||
field2: SafeEnum::Variant1}};
|
||||
//~^^ ERROR statics are not allowed to have destructors
|
||||
//~^^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
struct UnsafeStruct;
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ impl Drop for UnsafeStruct {
|
|||
|
||||
// Types with destructors are not allowed for statics
|
||||
static STATIC10: UnsafeStruct = UnsafeStruct;
|
||||
//~^ ERROR statics are not allowed to have destructor
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
struct MyOwned;
|
||||
|
||||
|
|
@ -105,19 +105,19 @@ static STATIC11: Box<MyOwned> = box MyOwned;
|
|||
// to have types with destructors
|
||||
// These should fail
|
||||
static mut STATIC12: UnsafeStruct = UnsafeStruct;
|
||||
//~^ ERROR mutable statics are not allowed to have destructors
|
||||
//~^^ ERROR statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
//~^^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
static mut STATIC13: SafeStruct = SafeStruct{field1: SafeEnum::Variant1,
|
||||
//~^ ERROR mutable statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
field2: SafeEnum::Variant3(WithDtor)};
|
||||
//~^ ERROR: statics are not allowed to have destructors
|
||||
//~^ ERROR: destructors in statics are an unstable feature
|
||||
|
||||
static mut STATIC14: SafeStruct = SafeStruct {
|
||||
//~^ ERROR mutable statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
field1: SafeEnum::Variant1,
|
||||
field2: SafeEnum::Variant4("str".to_string())
|
||||
//~^ ERROR method calls in statics are limited to constant inherent methods
|
||||
//~^ ERROR calls in statics are limited to constant functions
|
||||
};
|
||||
|
||||
static STATIC15: &'static [Box<MyOwned>] = &[
|
||||
|
|
@ -131,7 +131,7 @@ static STATIC16: (&'static Box<MyOwned>, &'static Box<MyOwned>) = (
|
|||
);
|
||||
|
||||
static mut STATIC17: SafeEnum = SafeEnum::Variant1;
|
||||
//~^ ERROR mutable statics are not allowed to have destructors
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
static STATIC19: Box<isize> =
|
||||
box 3;
|
||||
|
|
|
|||
|
|
@ -10,11 +10,12 @@
|
|||
|
||||
// Regression test for issue 9243
|
||||
|
||||
struct Test {
|
||||
pub struct Test {
|
||||
mem: isize,
|
||||
}
|
||||
|
||||
pub static g_test: Test = Test {mem: 0}; //~ ERROR statics are not allowed to have destructors
|
||||
pub static g_test: Test = Test {mem: 0};
|
||||
//~^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
impl Drop for Test {
|
||||
fn drop(&mut self) {}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@
|
|||
|
||||
static mut a: Box<isize> = box 3;
|
||||
//~^ ERROR allocations are not allowed in statics
|
||||
//~^^ ERROR mutable statics are not allowed to have boxes
|
||||
//~^^ ERROR destructors in statics are an unstable feature
|
||||
|
||||
fn main() {}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue