@@ -17,6 +17,7 @@ use mercurial_types::bdiff::Delta;
1717use nom:: Err ;
1818use nom:: IResult ;
1919use nom:: Needed ;
20+ use nom:: Parser as _;
2021use nom:: branch:: alt;
2122use nom:: bytes:: streaming:: tag;
2223use nom:: bytes:: streaming:: take;
@@ -142,7 +143,7 @@ pub fn indexng(input: &[u8]) -> IResult<&[u8], Entry, Error> {
142143 let ( input, linkrev) = be_u32 ( input) ?;
143144 let ( input, p1) = be_u32 ( input) ?;
144145 let ( input, p2) = be_u32 ( input) ?;
145- let ( input, hash) = take ( 32usize ) ( input) ?;
146+ let ( input, hash) = take ( 32usize ) . parse ( input) ?;
146147
147148 let entry = Entry {
148149 offset,
@@ -201,7 +202,7 @@ pub fn index0(input: &[u8]) -> IResult<&[u8], Entry, Error> {
201202pub fn delta ( input : & [ u8 ] ) -> IResult < & [ u8 ] , Delta , Error > {
202203 let ( input, start) = be_u32 ( input) ?;
203204 let ( input, end) = be_u32 ( input) ?;
204- let ( input, content) = length_data ( be_u32) ( input) ?;
205+ let ( input, content) = length_data ( be_u32) . parse ( input) ?;
205206
206207 let delta = Delta {
207208 start : start as usize ,
@@ -214,7 +215,7 @@ pub fn delta(input: &[u8]) -> IResult<&[u8], Delta, Error> {
214215
215216// Parse 0 or more deltas
216217fn deltas ( input : & [ u8 ] ) -> IResult < & [ u8 ] , Vec < Delta > , Error > {
217- many0 ( delta) ( input)
218+ many0 ( delta) . parse ( input)
218219}
219220
220221// A chunk of data data that contains some Deltas; the caller defines the framing bytes
@@ -229,7 +230,8 @@ pub fn deltachunk(input: &[u8]) -> IResult<&[u8], Vec<Delta>, Error> {
229230 preceded ( peek ( tag ( "x" ) ) , |i| zlib_decompress ( i, deltas) ) ,
230231 // compressed w/ lz4
231232 preceded ( tag ( "4" ) , |i| lz4_decompress ( i, deltas) ) ,
232- ) ) ) ( input) ?;
233+ ) ) )
234+ . parse ( input) ?;
233235
234236 Ok ( ( input, dv. into_iter ( ) . flatten ( ) . collect ( ) ) )
235237}
@@ -245,7 +247,8 @@ pub fn literal(input: &[u8]) -> IResult<&[u8], Vec<u8>, Error> {
245247 preceded ( peek ( tag ( "x" ) ) , |i| zlib_decompress ( i, remains_owned) ) ,
246248 preceded ( tag ( "4" ) , |i| lz4_decompress ( i, remains_owned) ) ,
247249 preceded ( tag ( "u" ) , remains_owned) ,
248- ) ) ( input)
250+ ) )
251+ . parse ( input)
249252}
250253
251254// Remap error to remove reference to `data`
0 commit comments