@@ -2,7 +2,7 @@ use super::{tokens::*, Rgb};
22use crate :: {
33 binary:: { BinaryFlavor , FailedResolveStrategy , TokenResolver } ,
44 de:: ColorSequence ,
5- util:: get_split ,
5+ util:: split_first_chunk ,
66 BinaryTape , BinaryToken , DeserializeError , DeserializeErrorKind , Error , ErrorKind ,
77} ;
88use serde:: de:: { self , Deserialize , DeserializeSeed , MapAccess , SeqAccess , Visitor } ;
@@ -24,8 +24,8 @@ impl<'data> OndemandParser<'data> {
2424
2525 #[ inline]
2626 pub fn next ( & mut self ) -> Option < u16 > {
27- let ( data, token) =
28- get_split :: < 2 > ( self . data ) . map ( |( head, rest) | ( rest, u16:: from_le_bytes ( head) ) ) ?;
27+ let ( data, token) = split_first_chunk :: < 2 > ( self . data )
28+ . map ( |( head, rest) | ( rest, u16:: from_le_bytes ( * head) ) ) ?;
2929 self . data = data;
3030 Some ( token)
3131 }
@@ -37,8 +37,8 @@ impl<'data> OndemandParser<'data> {
3737
3838 #[ inline]
3939 pub fn read_string ( & mut self ) -> Result < & ' data [ u8 ] , Error > {
40- let ( head, rest) = get_split :: < 2 > ( self . data ) . ok_or_else ( Error :: eof) ?;
41- let text_len = usize:: from ( u16:: from_le_bytes ( head) ) ;
40+ let ( head, rest) = split_first_chunk :: < 2 > ( self . data ) . ok_or_else ( Error :: eof) ?;
41+ let text_len = usize:: from ( u16:: from_le_bytes ( * head) ) ;
4242 if text_len <= rest. len ( ) {
4343 let ( text, rest) = rest. split_at ( text_len) ;
4444 self . data = rest;
@@ -57,44 +57,44 @@ impl<'data> OndemandParser<'data> {
5757
5858 #[ inline]
5959 fn read_u32 ( & mut self ) -> Result < u32 , Error > {
60- let ( head, rest) = get_split :: < 4 > ( self . data ) . ok_or_else ( Error :: eof) ?;
60+ let ( head, rest) = split_first_chunk :: < 4 > ( self . data ) . ok_or_else ( Error :: eof) ?;
6161 self . data = rest;
62- Ok ( u32:: from_le_bytes ( head) )
62+ Ok ( u32:: from_le_bytes ( * head) )
6363 }
6464
6565 #[ inline]
6666 fn read_u64 ( & mut self ) -> Result < u64 , Error > {
67- let ( head, rest) = get_split :: < 8 > ( self . data ) . ok_or_else ( Error :: eof) ?;
67+ let ( head, rest) = split_first_chunk :: < 8 > ( self . data ) . ok_or_else ( Error :: eof) ?;
6868 self . data = rest;
69- Ok ( u64:: from_le_bytes ( head) )
69+ Ok ( u64:: from_le_bytes ( * head) )
7070 }
7171
7272 #[ inline]
7373 fn read_i64 ( & mut self ) -> Result < i64 , Error > {
74- let ( head, rest) = get_split :: < 8 > ( self . data ) . ok_or_else ( Error :: eof) ?;
74+ let ( head, rest) = split_first_chunk :: < 8 > ( self . data ) . ok_or_else ( Error :: eof) ?;
7575 self . data = rest;
76- Ok ( i64:: from_le_bytes ( head) )
76+ Ok ( i64:: from_le_bytes ( * head) )
7777 }
7878
7979 #[ inline]
8080 fn read_i32 ( & mut self ) -> Result < i32 , Error > {
81- let ( head, rest) = get_split :: < 4 > ( self . data ) . ok_or_else ( Error :: eof) ?;
81+ let ( head, rest) = split_first_chunk :: < 4 > ( self . data ) . ok_or_else ( Error :: eof) ?;
8282 self . data = rest;
83- Ok ( i32:: from_le_bytes ( head) )
83+ Ok ( i32:: from_le_bytes ( * head) )
8484 }
8585
8686 #[ inline]
8787 fn read_f32 ( & mut self ) -> Result < [ u8 ; 4 ] , Error > {
88- let ( head, rest) = get_split :: < 4 > ( self . data ) . ok_or_else ( Error :: eof) ?;
88+ let ( head, rest) = split_first_chunk :: < 4 > ( self . data ) . ok_or_else ( Error :: eof) ?;
8989 self . data = rest;
90- Ok ( head)
90+ Ok ( * head)
9191 }
9292
9393 #[ inline]
9494 fn read_f64 ( & mut self ) -> Result < [ u8 ; 8 ] , Error > {
95- let ( head, rest) = get_split :: < 8 > ( self . data ) . ok_or_else ( Error :: eof) ?;
95+ let ( head, rest) = split_first_chunk :: < 8 > ( self . data ) . ok_or_else ( Error :: eof) ?;
9696 self . data = rest;
97- Ok ( head)
97+ Ok ( * head)
9898 }
9999
100100 #[ inline]
0 commit comments