diff options
| author | bors <bors@rust-lang.org> | 2023-01-11 11:17:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-11 11:17:22 +0000 |
| commit | b22c152958eade17a71d899b29a2d39bcc77aa48 (patch) | |
| tree | ec6da75dc598a0a4086c0cc032c86d7241be1bc1 /src/test/ui/check-static-values-constraints.rs | |
| parent | 8ecaad85f61375b18e1667b51a3ef350121d2ca0 (diff) | |
| parent | 40ba0e84d53f605ccf01836e9c2d27892728ae81 (diff) | |
| download | rust-b22c152958eade17a71d899b29a2d39bcc77aa48.tar.gz rust-b22c152958eade17a71d899b29a2d39bcc77aa48.zip | |
Auto merge of #106458 - albertlarsan68:move-tests, r=jyn514
Move src/test to the root
See MCP at rust-lang/compiler-team#573
There may be more changes needed.
The first commit is just the move of the files:
You can check that the first commit did not do anything else than renames by running
```
git diff --diff-filter=r -M100% <rust-lang remote>/master <first commit hash>
```
The output should be empty, because the filter excludes renames, and the match threshold for qualifying a rename is 100%.
The second one is mostly a "find and replace" of `src/test` to `tests` and whatever is needed to make CI pass.
What is left to do:
---
- [x] Move directory
- [ ] Change references to `src/test`
- [x] Change references in-tree
- [ ] Change references in submodules / out-of-tree docs
- [x] Make CI pass:
- [x] Fix tidy
- [x] Fix tests
- [x] Bless tests if needed (shouldn't normally)
- [ ] Merge it !
Diffstat (limited to 'src/test/ui/check-static-values-constraints.rs')
| -rw-r--r-- | src/test/ui/check-static-values-constraints.rs | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/src/test/ui/check-static-values-constraints.rs b/src/test/ui/check-static-values-constraints.rs deleted file mode 100644 index f6a577d0d9c..00000000000 --- a/src/test/ui/check-static-values-constraints.rs +++ /dev/null @@ -1,113 +0,0 @@ -// Verifies all possible restrictions for statics values. - -#![allow(warnings)] -#![feature(box_syntax)] - -use std::marker; - -struct WithDtor; - -impl Drop for WithDtor { - fn drop(&mut self) {} -} - -// This enum will be used to test the following rules: -// 1. Variants are safe for static -// 2. Expr calls are allowed as long as they arguments are safe -// 3. Expr calls with unsafe arguments for statics are rejected -enum SafeEnum { - Variant1, - Variant2(isize), - Variant3(WithDtor), - Variant4(String) -} - -// These should be ok -static STATIC1: SafeEnum = SafeEnum::Variant1; -static STATIC2: SafeEnum = SafeEnum::Variant2(0); -static STATIC3: SafeEnum = SafeEnum::Variant3(WithDtor); - -enum UnsafeEnum { - Variant5, - Variant6(isize) -} - -impl Drop for UnsafeEnum { - fn drop(&mut self) {} -} - - -static STATIC4: UnsafeEnum = UnsafeEnum::Variant5; -static STATIC5: UnsafeEnum = UnsafeEnum::Variant6(0); - - -struct SafeStruct { - field1: SafeEnum, - field2: SafeEnum, -} - - -// Struct fields are safe, hence this static should be safe -static STATIC6: SafeStruct = SafeStruct{field1: SafeEnum::Variant1, field2: SafeEnum::Variant2(0)}; - -static STATIC7: SafeStruct = SafeStruct{field1: SafeEnum::Variant1, - field2: SafeEnum::Variant3(WithDtor)}; - -// Test variadic constructor for structs. The base struct should be examined -// as well as every field present in the constructor. -// This example shouldn't fail because all the fields are safe. -static STATIC8: SafeStruct = SafeStruct{field1: SafeEnum::Variant1, - ..SafeStruct{field1: SafeEnum::Variant1, - field2: SafeEnum::Variant1}}; - -// This example should fail because field1 in the base struct is not safe -static STATIC9: SafeStruct = SafeStruct{field1: SafeEnum::Variant1, - ..SafeStruct{field1: SafeEnum::Variant3(WithDtor), -//~^ ERROR destructor of - field2: SafeEnum::Variant1}}; - -struct UnsafeStruct; - -impl Drop for UnsafeStruct { - fn drop(&mut self) {} -} - -static STATIC10: UnsafeStruct = UnsafeStruct; - -struct MyOwned; - -static STATIC11: Box<MyOwned> = box MyOwned; -//~^ ERROR allocations are not allowed in statics - -static mut STATIC12: UnsafeStruct = UnsafeStruct; - -static mut STATIC13: SafeStruct = SafeStruct{field1: SafeEnum::Variant1, - field2: SafeEnum::Variant3(WithDtor)}; - -static mut STATIC14: SafeStruct = SafeStruct { - field1: SafeEnum::Variant1, - field2: SafeEnum::Variant4("str".to_string()) -//~^ ERROR cannot call non-const fn -}; - -static STATIC15: &'static [Box<MyOwned>] = &[ - box MyOwned, //~ ERROR allocations are not allowed in statics - box MyOwned, //~ ERROR allocations are not allowed in statics -]; - -static STATIC16: (&'static Box<MyOwned>, &'static Box<MyOwned>) = ( - &box MyOwned, //~ ERROR allocations are not allowed in statics - &box MyOwned, //~ ERROR allocations are not allowed in statics -); - -static mut STATIC17: SafeEnum = SafeEnum::Variant1; - -static STATIC19: Box<isize> = - box 3; -//~^ ERROR allocations are not allowed in statics - -pub fn main() { - let y = { static x: Box<isize> = box 3; x }; - //~^ ERROR allocations are not allowed in statics - //~| ERROR cannot move out of static item -} |
