@@ -94,11 +94,6 @@ impl EventLinkedChunk {
94
94
self . chunks . push_items_back ( events) ;
95
95
}
96
96
97
- /// Push a gap after all events or gaps.
98
- pub fn push_gap ( & mut self , gap : Gap ) {
99
- self . chunks . push_gap_back ( gap) ;
100
- }
101
-
102
97
/// Remove an empty chunk at the given position.
103
98
///
104
99
/// Note: the chunk must either be a gap, or an empty items chunk, and it
@@ -308,7 +303,7 @@ impl EventLinkedChunk {
308
303
( chunk. is_items ( ) && chunk. num_items ( ) == 0 ) . then_some ( chunk. identifier ( ) )
309
304
} ) ;
310
305
311
- self . push_gap ( new_gap) ;
306
+ self . chunks . push_gap_back ( new_gap) ;
312
307
313
308
if let Some ( prev_chunk_to_remove) = prev_chunk_to_remove {
314
309
self . remove_empty_chunk_at ( prev_chunk_to_remove)
@@ -384,7 +379,7 @@ impl EventLinkedChunk {
384
379
. insert_gap_at ( new_gap, new_pos)
385
380
. expect ( "events_chunk_pos represents a valid chunk position" ) ;
386
381
} else {
387
- self . push_gap ( new_gap) ;
382
+ self . chunks . push_gap_back ( new_gap) ;
388
383
}
389
384
}
390
385
@@ -586,41 +581,6 @@ mod tests {
586
581
) ;
587
582
}
588
583
589
- #[ test]
590
- fn test_push_gap ( ) {
591
- let ( event_id_0, event_0) = new_event ( "$ev0" ) ;
592
- let ( event_id_1, event_1) = new_event ( "$ev1" ) ;
593
-
594
- let mut linked_chunk = EventLinkedChunk :: new ( ) ;
595
-
596
- linked_chunk. push_events ( [ event_0] ) ;
597
- linked_chunk. push_gap ( Gap { prev_token : "hello" . to_owned ( ) } ) ;
598
- linked_chunk. push_events ( [ event_1] ) ;
599
-
600
- assert_events_eq ! (
601
- linked_chunk. events( ) ,
602
- [
603
- ( event_id_0 at ( 0 , 0 ) ) ,
604
- ( event_id_1 at ( 2 , 0 ) ) ,
605
- ]
606
- ) ;
607
-
608
- {
609
- let mut chunks = linked_chunk. chunks ( ) ;
610
-
611
- assert_let ! ( Some ( chunk) = chunks. next( ) ) ;
612
- assert ! ( chunk. is_items( ) ) ;
613
-
614
- assert_let ! ( Some ( chunk) = chunks. next( ) ) ;
615
- assert ! ( chunk. is_gap( ) ) ;
616
-
617
- assert_let ! ( Some ( chunk) = chunks. next( ) ) ;
618
- assert ! ( chunk. is_items( ) ) ;
619
-
620
- assert ! ( chunks. next( ) . is_none( ) ) ;
621
- }
622
- }
623
-
624
584
#[ test]
625
585
fn test_replace_gap_at ( ) {
626
586
let ( event_id_0, event_0) = new_event ( "$ev0" ) ;
@@ -630,7 +590,7 @@ mod tests {
630
590
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
631
591
632
592
linked_chunk. push_events ( [ event_0] ) ;
633
- linked_chunk. push_gap ( Gap { prev_token : "hello" . to_owned ( ) } ) ;
593
+ linked_chunk. chunks . push_gap_back ( Gap { prev_token : "hello" . to_owned ( ) } ) ;
634
594
635
595
let gap_chunk_id = linked_chunk
636
596
. chunks ( )
@@ -670,9 +630,9 @@ mod tests {
670
630
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
671
631
672
632
linked_chunk. push_events ( [ event_0, event_1] ) ;
673
- linked_chunk. push_gap ( Gap { prev_token : "middle" . to_owned ( ) } ) ;
633
+ linked_chunk. chunks . push_gap_back ( Gap { prev_token : "middle" . to_owned ( ) } ) ;
674
634
linked_chunk. push_events ( [ event_2] ) ;
675
- linked_chunk. push_gap ( Gap { prev_token : "end" . to_owned ( ) } ) ;
635
+ linked_chunk. chunks . push_gap_back ( Gap { prev_token : "end" . to_owned ( ) } ) ;
676
636
677
637
// Remove the first gap.
678
638
let first_gap_id = linked_chunk
@@ -705,7 +665,7 @@ mod tests {
705
665
// Push some events.
706
666
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
707
667
linked_chunk. push_events ( [ event_0, event_1] ) ;
708
- linked_chunk. push_gap ( Gap { prev_token : "hello" . to_owned ( ) } ) ;
668
+ linked_chunk. chunks . push_gap_back ( Gap { prev_token : "hello" . to_owned ( ) } ) ;
709
669
linked_chunk. push_events ( [ event_2, event_3] ) ;
710
670
711
671
assert_events_eq ! (
@@ -778,7 +738,7 @@ mod tests {
778
738
// Push some events.
779
739
let mut linked_chunk = EventLinkedChunk :: new ( ) ;
780
740
linked_chunk. push_events ( [ event_0, event_1] ) ;
781
- linked_chunk. push_gap ( Gap { prev_token : "raclette" . to_owned ( ) } ) ;
741
+ linked_chunk. chunks . push_gap_back ( Gap { prev_token : "raclette" . to_owned ( ) } ) ;
782
742
linked_chunk. push_events ( [ event_2] ) ;
783
743
784
744
// Read the updates as `VectorDiff`.
@@ -833,7 +793,7 @@ mod tests {
833
793
. into_event( ) ,
834
794
event_factory. text_msg( "you" ) . event_id( event_id!( "$2" ) ) . into_event( ) ,
835
795
] ) ;
836
- linked_chunk. push_gap ( Gap { prev_token : "raclette" . to_owned ( ) } ) ;
796
+ linked_chunk. chunks . push_gap_back ( Gap { prev_token : "raclette" . to_owned ( ) } ) ;
837
797
838
798
// Flush updates to the order tracker.
839
799
let _ = linked_chunk. updates_as_vector_diffs ( ) ;
0 commit comments