@@ -2,7 +2,7 @@ use super::{tokens::*, Rgb};
2
2
use crate :: {
3
3
binary:: { BinaryFlavor , FailedResolveStrategy , TokenResolver } ,
4
4
de:: ColorSequence ,
5
- util:: get_split ,
5
+ util:: split_first_chunk ,
6
6
BinaryTape , BinaryToken , DeserializeError , DeserializeErrorKind , Error , ErrorKind ,
7
7
} ;
8
8
use serde:: de:: { self , Deserialize , DeserializeSeed , MapAccess , SeqAccess , Visitor } ;
@@ -24,8 +24,8 @@ impl<'data> OndemandParser<'data> {
24
24
25
25
#[ inline]
26
26
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) ) ) ?;
29
29
self . data = data;
30
30
Some ( token)
31
31
}
@@ -37,8 +37,8 @@ impl<'data> OndemandParser<'data> {
37
37
38
38
#[ inline]
39
39
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) ) ;
42
42
if text_len <= rest. len ( ) {
43
43
let ( text, rest) = rest. split_at ( text_len) ;
44
44
self . data = rest;
@@ -57,44 +57,44 @@ impl<'data> OndemandParser<'data> {
57
57
58
58
#[ inline]
59
59
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) ?;
61
61
self . data = rest;
62
- Ok ( u32:: from_le_bytes ( head) )
62
+ Ok ( u32:: from_le_bytes ( * head) )
63
63
}
64
64
65
65
#[ inline]
66
66
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) ?;
68
68
self . data = rest;
69
- Ok ( u64:: from_le_bytes ( head) )
69
+ Ok ( u64:: from_le_bytes ( * head) )
70
70
}
71
71
72
72
#[ inline]
73
73
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) ?;
75
75
self . data = rest;
76
- Ok ( i64:: from_le_bytes ( head) )
76
+ Ok ( i64:: from_le_bytes ( * head) )
77
77
}
78
78
79
79
#[ inline]
80
80
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) ?;
82
82
self . data = rest;
83
- Ok ( i32:: from_le_bytes ( head) )
83
+ Ok ( i32:: from_le_bytes ( * head) )
84
84
}
85
85
86
86
#[ inline]
87
87
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) ?;
89
89
self . data = rest;
90
- Ok ( head)
90
+ Ok ( * head)
91
91
}
92
92
93
93
#[ inline]
94
94
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) ?;
96
96
self . data = rest;
97
- Ok ( head)
97
+ Ok ( * head)
98
98
}
99
99
100
100
#[ inline]
0 commit comments