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/generator/drop-control-flow.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/generator/drop-control-flow.rs')
| -rw-r--r-- | src/test/ui/generator/drop-control-flow.rs | 139 |
1 files changed, 0 insertions, 139 deletions
diff --git a/src/test/ui/generator/drop-control-flow.rs b/src/test/ui/generator/drop-control-flow.rs deleted file mode 100644 index d383680002f..00000000000 --- a/src/test/ui/generator/drop-control-flow.rs +++ /dev/null @@ -1,139 +0,0 @@ -// build-pass -// compile-flags: -Zdrop-tracking - -// A test to ensure generators capture values that were conditionally dropped, -// and also that values that are dropped along all paths to a yield do not get -// included in the generator type. - -#![feature(generators, negative_impls)] -#![allow(unused_assignments, dead_code)] - -struct Ptr; -impl<'a> Drop for Ptr { - fn drop(&mut self) {} -} - -struct NonSend; -impl !Send for NonSend {} - -fn assert_send<T: Send>(_: T) {} - -// This test case is reduced from src/test/ui/drop/dynamic-drop-async.rs -fn one_armed_if(arg: bool) { - let _ = || { - let arr = [Ptr]; - if arg { - drop(arr); - } - yield; - }; -} - -fn two_armed_if(arg: bool) { - assert_send(|| { - let arr = [Ptr]; - if arg { - drop(arr); - } else { - drop(arr); - } - yield; - }) -} - -fn if_let(arg: Option<i32>) { - let _ = || { - let arr = [Ptr]; - if let Some(_) = arg { - drop(arr); - } - yield; - }; -} - -fn init_in_if(arg: bool) { - assert_send(|| { - let mut x = NonSend; - drop(x); - if arg { - x = NonSend; - } else { - yield; - } - }) -} - -fn init_in_match_arm(arg: Option<i32>) { - assert_send(|| { - let mut x = NonSend; - drop(x); - match arg { - Some(_) => x = NonSend, - None => yield, - } - }) -} - -fn reinit() { - let _ = || { - let mut arr = [Ptr]; - drop(arr); - arr = [Ptr]; - yield; - }; -} - -fn loop_uninit() { - let _ = || { - let mut arr = [Ptr]; - let mut count = 0; - drop(arr); - while count < 3 { - yield; - arr = [Ptr]; - count += 1; - } - }; -} - -fn nested_loop() { - let _ = || { - let mut arr = [Ptr]; - let mut count = 0; - drop(arr); - while count < 3 { - for _ in 0..3 { - yield; - } - arr = [Ptr]; - count += 1; - } - }; -} - -fn loop_continue(b: bool) { - let _ = || { - let mut arr = [Ptr]; - let mut count = 0; - drop(arr); - while count < 3 { - count += 1; - yield; - if b { - arr = [Ptr]; - continue; - } - } - }; -} - -fn main() { - one_armed_if(true); - if_let(Some(41)); - init_in_if(true); - init_in_match_arm(Some(41)); - reinit(); - loop_uninit(); - nested_loop(); - loop_continue(true); -} |
