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/structs-enums/enum-layout-optimization.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/structs-enums/enum-layout-optimization.rs')
| -rw-r--r-- | src/test/ui/structs-enums/enum-layout-optimization.rs | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/test/ui/structs-enums/enum-layout-optimization.rs b/src/test/ui/structs-enums/enum-layout-optimization.rs deleted file mode 100644 index 05d297906c3..00000000000 --- a/src/test/ui/structs-enums/enum-layout-optimization.rs +++ /dev/null @@ -1,50 +0,0 @@ -// run-pass -// Test that we will do various size optimizations to enum layout, but -// *not* if `#[repr(u8)]` or `#[repr(C)]` is passed. See also #40029. - -#![allow(dead_code)] - -use std::mem; - -enum Nullable<T> { - Alive(T), - Dropped, -} - -#[repr(u8)] -enum NullableU8<T> { - Alive(T), - Dropped, -} - -#[repr(C)] -enum NullableC<T> { - Alive(T), - Dropped, -} - -struct StructNewtype<T>(T); - -#[repr(C)] -struct StructNewtypeC<T>(T); - -enum EnumNewtype<T> { Variant(T) } - -#[repr(u8)] -enum EnumNewtypeU8<T> { Variant(T) } - -#[repr(C)] -enum EnumNewtypeC<T> { Variant(T) } - -fn main() { - assert!(mem::size_of::<Box<i32>>() == mem::size_of::<Nullable<Box<i32>>>()); - assert!(mem::size_of::<Box<i32>>() < mem::size_of::<NullableU8<Box<i32>>>()); - assert!(mem::size_of::<Box<i32>>() < mem::size_of::<NullableC<Box<i32>>>()); - - assert!(mem::size_of::<i32>() == mem::size_of::<StructNewtype<i32>>()); - assert!(mem::size_of::<i32>() == mem::size_of::<StructNewtypeC<i32>>()); - - assert!(mem::size_of::<i32>() == mem::size_of::<EnumNewtype<i32>>()); - assert!(mem::size_of::<i32>() < mem::size_of::<EnumNewtypeU8<i32>>()); - assert!(mem::size_of::<i32>() < mem::size_of::<EnumNewtypeC<i32>>()); -} |
