| ... | @@ -1338,7 +1338,7 @@ mod tests { | ... | @@ -1338,7 +1338,7 @@ mod tests { |
| 1338 | } | 1338 | } |
| 1339 | | 1339 | |
| 1340 | #[test] | 1340 | #[test] |
| 1341 | fn contended_page_actions_keep_their_position_in_undo_and_redo() { | 1341 | fn refused_page_actions_keep_their_position_in_undo_and_redo() { |
| 1342 | for redo in [false, true] { | 1342 | for redo in [false, true] { |
| 1343 | let mut timeline = Timeline::default(); | 1343 | let mut timeline = Timeline::default(); |
| 1344 | let action = Action { | 1344 | let action = Action { |
| ... | @@ -1360,9 +1360,6 @@ mod tests { | ... | @@ -1360,9 +1360,6 @@ mod tests { |
| 1360 | else { | 1360 | else { |
| 1361 | panic!("the current page has a pending action"); | 1361 | panic!("the current page has a pending action"); |
| 1362 | }; | 1362 | }; |
| 1363 | let structure = Arc::new(async_lock::Mutex::new(())); | | |
| 1364 | let changing = structure.try_lock_arc().unwrap(); | | |
| 1365 | assert!(structure.try_lock_arc().is_none()); | | |
| 1366 | timeline.put_back((redo, at), action); | 1363 | timeline.put_back((redo, at), action); |
| 1367 | let depth = if redo { [0, 1] } else { [1, 0] }; | 1364 | let depth = if redo { [0, 1] } else { [1, 0] }; |
| 1368 | assert!( | 1365 | assert!( |
| ... | @@ -1370,8 +1367,6 @@ mod tests { | ... | @@ -1370,8 +1367,6 @@ mod tests { |
| 1370 | "newer edit stays first" | 1367 | "newer edit stays first" |
| 1371 | ); | 1368 | ); |
| 1372 | timeline.stepped(page(3), redo); | 1369 | timeline.stepped(page(3), redo); |
| 1373 | drop(changing); | | |
| 1374 | let _changing = structure.try_lock_arc().unwrap(); | | |
| 1375 | let Some(Next::Action(action, at)) = timeline.next(redo, page(1), [0, 0], &here()) | 1370 | let Some(Next::Action(action, at)) = timeline.next(redo, page(1), [0, 0], &here()) |
| 1376 | else { | 1371 | else { |
| 1377 | panic!("the refused action must remain in its original stack"); | 1372 | panic!("the refused action must remain in its original stack"); |