diff options
| author | bors <bors@rust-lang.org> | 2025-05-12 14:29:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-12 14:29:36 +0000 |
| commit | 420ca7104f4db107837cba4d8e48a82c53fcb76c (patch) | |
| tree | 5ee432febd99300c89063b2bf8f4585db5284956 | |
| parent | bc7512ee6309ee7e8cacf87b94aa6d1f550c9d99 (diff) | |
| parent | 2fdf3d98205abfbf1a034ef1f04369a6342645ec (diff) | |
| download | rust-420ca7104f4db107837cba4d8e48a82c53fcb76c.tar.gz rust-420ca7104f4db107837cba4d8e48a82c53fcb76c.zip | |
Auto merge of #140941 - ferrocene:ja/gh140939-fix-async-drop-test, r=petrochenkov
ui/async-drop-initial: factor in panic strategy in destructor size check the size of `AsyncStruct`'s destructor depends on whether the configured panic strategy is 'unwind' or 'abort' so factor that into the test using conditional compilation fixes rust-lang/rust#140939 fixes rust-lang/rust#140493
| -rw-r--r-- | tests/ui/async-await/async-drop/async-drop-initial.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/ui/async-await/async-drop/async-drop-initial.rs b/tests/ui/async-await/async-drop/async-drop-initial.rs index 80b34840c8b..263b70699f5 100644 --- a/tests/ui/async-await/async-drop/async-drop-initial.rs +++ b/tests/ui/async-await/async-drop/async-drop-initial.rs @@ -60,7 +60,10 @@ fn main() { let j = 42; test_async_drop(&i, 16).await; test_async_drop(&j, 16).await; - test_async_drop(AsyncStruct { b: AsyncInt(8), a: AsyncInt(7), i: 6 }, 168).await; + test_async_drop( + AsyncStruct { b: AsyncInt(8), a: AsyncInt(7), i: 6 }, + if cfg!(panic = "unwind") { 168 } else { 136 }, + ).await; test_async_drop(ManuallyDrop::new(AsyncInt(9)), 16).await; let foo = AsyncInt(10); |