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/layout/zero-sized-array-enum-niche.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/layout/zero-sized-array-enum-niche.rs')
| -rw-r--r-- | src/test/ui/layout/zero-sized-array-enum-niche.rs | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/src/test/ui/layout/zero-sized-array-enum-niche.rs b/src/test/ui/layout/zero-sized-array-enum-niche.rs deleted file mode 100644 index 23bbbfbfc58..00000000000 --- a/src/test/ui/layout/zero-sized-array-enum-niche.rs +++ /dev/null @@ -1,45 +0,0 @@ -// normalize-stderr-test "pref: Align\([1-8] bytes\)" -> "pref: $$PREF_ALIGN" -#![feature(rustc_attrs)] -#![crate_type = "lib"] - -// Various tests around the behavior of zero-sized arrays and -// enum niches, especially that they have coherent size and alignment. - -// The original problem in #99836 came from ndarray's `TryFrom` for -// `SliceInfo<[SliceInfoElem; 0], Din, Dout>`, where that returns -// `Result<Self, ShapeError>` ~= `Result<AlignedZST, TypeWithNiche>`. -// This is a close enough approximation: -#[rustc_layout(debug)] -type AlignedResult = Result<[u32; 0], bool>; //~ ERROR: layout_of -// The bug gave that size 1 with align 4, but the size should also be 4. -// It was also using the bool niche for the enum tag, which is fine, but -// after the fix, layout decides to use a direct tagged repr instead. - -// Here's another case with multiple ZST alignments, where we should -// get the maximal alignment and matching size. -#[rustc_layout(debug)] -enum MultipleAlignments { //~ ERROR: layout_of - Align2([u16; 0]), - Align4([u32; 0]), - Niche(bool), -} - -// Tagged repr is clever enough to grow tags to fill any padding, e.g.: -// 1. `T_FF` (one byte of Tag, one byte of padding, two bytes of align=2 Field) -// -> `TTFF` (Tag has expanded to two bytes, i.e. like `#[repr(u16)]`) -// 2. `TFF` (one byte of Tag, two bytes of align=1 Field) -// -> Tag has no room to expand! -// (this outcome can be forced onto 1. by wrapping Field in `Packed<...>`) -#[repr(packed)] -struct Packed<T>(T); - -#[rustc_layout(debug)] -type NicheLosesToTagged = Result<[u32; 0], Packed<std::num::NonZeroU16>>; //~ ERROR: layout_of -// Should get tag_encoding: Direct, size == align == 4. - -#[repr(u16)] -enum U16IsZero { _Zero = 0 } - -#[rustc_layout(debug)] -type NicheWinsOverTagged = Result<[u32; 0], Packed<U16IsZero>>; //~ ERROR: layout_of -// Should get tag_encoding: Niche, size == align == 4. |
