|
3 | 3 |
|
4 | 4 | use std::mem; |
5 | 5 | use std::sync::atomic::{AtomicU32, Ordering}; |
| 6 | +use std::sync::Arc; |
6 | 7 | use std::time::Duration; |
7 | 8 | use tokio::runtime; |
8 | 9 | use tokio::sync::OnceCell; |
9 | 10 | use tokio::sync::SetError; |
10 | 11 | use tokio::time; |
11 | 12 |
|
12 | | -#[test] |
13 | | -fn drop_cell() { |
14 | | - static NUM_DROPS: AtomicU32 = AtomicU32::new(0); |
15 | | - |
16 | | - struct Foo {} |
| 13 | +struct Foo { |
| 14 | + value: Arc<AtomicU32>, |
| 15 | +} |
17 | 16 |
|
18 | | - let fooer = Foo {}; |
| 17 | +impl Drop for Foo { |
| 18 | + fn drop(&mut self) { |
| 19 | + self.value.fetch_add(1, Ordering::Release); |
| 20 | + } |
| 21 | +} |
19 | 22 |
|
20 | | - impl Drop for Foo { |
21 | | - fn drop(&mut self) { |
22 | | - NUM_DROPS.fetch_add(1, Ordering::Release); |
23 | | - } |
| 23 | +impl From<Arc<AtomicU32>> for Foo { |
| 24 | + fn from(value: Arc<AtomicU32>) -> Self { |
| 25 | + Foo { value } |
24 | 26 | } |
| 27 | +} |
25 | 28 |
|
| 29 | +#[test] |
| 30 | +fn drop_cell() { |
| 31 | + let num_drops = Arc::new(AtomicU32::new(0)); |
26 | 32 | { |
27 | 33 | let once_cell = OnceCell::new(); |
28 | | - let prev = once_cell.set(fooer); |
| 34 | + let prev = once_cell.set(Foo::from(num_drops.clone())); |
29 | 35 | assert!(prev.is_ok()) |
30 | 36 | } |
31 | | - assert!(NUM_DROPS.load(Ordering::Acquire) == 1); |
| 37 | + assert!(num_drops.load(Ordering::Acquire) == 1); |
32 | 38 | } |
33 | 39 |
|
34 | 40 | #[test] |
35 | 41 | fn drop_cell_new_with() { |
36 | | - static NUM_DROPS: AtomicU32 = AtomicU32::new(0); |
37 | | - |
38 | | - struct Foo {} |
39 | | - |
40 | | - let fooer = Foo {}; |
41 | | - |
42 | | - impl Drop for Foo { |
43 | | - fn drop(&mut self) { |
44 | | - NUM_DROPS.fetch_add(1, Ordering::Release); |
45 | | - } |
46 | | - } |
47 | | - |
| 42 | + let num_drops = Arc::new(AtomicU32::new(0)); |
48 | 43 | { |
49 | | - let once_cell = OnceCell::new_with(Some(fooer)); |
| 44 | + let once_cell = OnceCell::new_with(Some(Foo::from(num_drops.clone()))); |
50 | 45 | assert!(once_cell.initialized()); |
51 | 46 | } |
52 | | - assert!(NUM_DROPS.load(Ordering::Acquire) == 1); |
| 47 | + assert!(num_drops.load(Ordering::Acquire) == 1); |
53 | 48 | } |
54 | 49 |
|
55 | 50 | #[test] |
56 | 51 | fn drop_into_inner() { |
57 | | - static NUM_DROPS: AtomicU32 = AtomicU32::new(0); |
58 | | - |
59 | | - struct Foo {} |
60 | | - |
61 | | - let fooer = Foo {}; |
62 | | - |
63 | | - impl Drop for Foo { |
64 | | - fn drop(&mut self) { |
65 | | - NUM_DROPS.fetch_add(1, Ordering::Release); |
66 | | - } |
67 | | - } |
| 52 | + let num_drops = Arc::new(AtomicU32::new(0)); |
68 | 53 |
|
69 | 54 | let once_cell = OnceCell::new(); |
70 | | - assert!(once_cell.set(fooer).is_ok()); |
| 55 | + assert!(once_cell.set(Foo::from(num_drops.clone())).is_ok()); |
71 | 56 | let fooer = once_cell.into_inner(); |
72 | | - let count = NUM_DROPS.load(Ordering::Acquire); |
| 57 | + let count = num_drops.load(Ordering::Acquire); |
73 | 58 | assert!(count == 0); |
74 | 59 | drop(fooer); |
75 | | - let count = NUM_DROPS.load(Ordering::Acquire); |
| 60 | + let count = num_drops.load(Ordering::Acquire); |
76 | 61 | assert!(count == 1); |
77 | 62 | } |
78 | 63 |
|
79 | 64 | #[test] |
80 | 65 | fn drop_into_inner_new_with() { |
81 | | - static NUM_DROPS: AtomicU32 = AtomicU32::new(0); |
82 | | - |
83 | | - struct Foo {} |
84 | | - |
85 | | - let fooer = Foo {}; |
86 | | - |
87 | | - impl Drop for Foo { |
88 | | - fn drop(&mut self) { |
89 | | - NUM_DROPS.fetch_add(1, Ordering::Release); |
90 | | - } |
91 | | - } |
| 66 | + let num_drops = Arc::new(AtomicU32::new(0)); |
| 67 | + let fooer = Foo::from(num_drops.clone()); |
92 | 68 |
|
93 | 69 | let once_cell = OnceCell::new_with(Some(fooer)); |
94 | 70 | let fooer = once_cell.into_inner(); |
95 | | - let count = NUM_DROPS.load(Ordering::Acquire); |
| 71 | + let count = num_drops.load(Ordering::Acquire); |
96 | 72 | assert!(count == 0); |
97 | 73 | mem::drop(fooer); |
98 | | - let count = NUM_DROPS.load(Ordering::Acquire); |
| 74 | + let count = num_drops.load(Ordering::Acquire); |
99 | 75 | assert!(count == 1); |
100 | 76 | } |
101 | 77 |
|
|
0 commit comments