@@ -412,7 +412,7 @@ impl GraphemeCursor {
412412/// ```
413413pub fn provide_context ( & mut self , chunk : & str , chunk_start : usize ) {
414414use crate :: tables:: graphemeas gr;
415- assert ! ( chunk_start. saturating_add ( chunk. len( ) ) ==self . pre_context_offset. unwrap( ) ) ;
415+ assert ! ( chunk_start + chunk. len( ) ==self . pre_context_offset. unwrap( ) ) ;
416416self . pre_context_offset =None ;
417417if self . is_extended && chunk_start + chunk. len ( ) ==self . offset {
418418let ch = chunk. chars ( ) . next_back ( ) . unwrap ( ) ;
@@ -598,15 +598,15 @@ impl GraphemeCursor {
598598if self . state ==GraphemeState :: NotBreak {
599599return Ok ( false ) ;
600600}
601- if ( self . offset < chunk_start ||self . offset >= chunk_start. saturating_add ( chunk. len ( ) ) )
602- &&( self . offset > chunk_start. saturating_add ( chunk. len ( ) ) ||self . cat_after . is_none ( ) )
601+ if ( self . offset < chunk_start ||self . offset >= chunk_start + chunk. len ( ) )
602+ &&( self . offset > chunk_start + chunk. len ( ) ||self . cat_after . is_none ( ) )
603603{
604604return Err ( GraphemeIncomplete :: InvalidOffset ) ;
605605}
606606if let Some ( pre_context_offset) =self . pre_context_offset {
607607return Err ( GraphemeIncomplete :: PreContext ( pre_context_offset) ) ;
608608}
609- let offset_in_chunk =self . offset . saturating_sub ( chunk_start) ;
609+ let offset_in_chunk =self . offset - chunk_start;
610610if self . cat_after . is_none ( ) {
611611let ch = chunk[ offset_in_chunk..] . chars ( ) . next ( ) . unwrap ( ) ;
612612self . cat_after =Some ( self . grapheme_category ( ch) ) ;
@@ -705,7 +705,7 @@ impl GraphemeCursor {
705705self . cat_after =Some ( self . grapheme_category ( ch) ) ;
706706}
707707} else {
708- self . offset = self . offset . saturating_add ( ch. len_utf8 ( ) ) ;
708+ self . offset += ch. len_utf8 ( ) ;
709709self . state =GraphemeState :: Unknown ;
710710self . cat_before =self . cat_after . take ( ) ;
711711if self . cat_before . is_none ( ) {
@@ -784,7 +784,7 @@ impl GraphemeCursor {
784784if self . offset == chunk_start{
785785return Err ( GraphemeIncomplete :: PrevChunk ) ;
786786}
787- let mut iter = chunk[ ..self . offset . saturating_sub ( chunk_start) ] . chars ( ) . rev ( ) ;
787+ let mut iter = chunk[ ..self . offset - chunk_start] . chars ( ) . rev ( ) ;
788788let mut ch = iter. next ( ) . unwrap ( ) ;
789789loop {
790790if self . offset == chunk_start{