Skip to content

Commit d9bcd60

Browse files
David Tolnayfacebook-github-bot
authored andcommitted
Update mercurial from nom v7 to nom v8
Differential Revision: D75796555 fbshipit-source-id: 18f76ce21bbad730cf8af6fdbb767e3409a449b4
1 parent ec25a4d commit d9bcd60

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

eden/mononoke/mercurial/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ rust_library(
3333
"fbsource//third-party/rust:bytes",
3434
"fbsource//third-party/rust:flate2",
3535
"fbsource//third-party/rust:memmap2",
36-
"fbsource//third-party/rust:nom-old",
36+
"fbsource//third-party/rust:nom",
3737
"fbsource//third-party/rust:thiserror",
3838
":mercurial_types",
3939
"//eden/scm/lib/lz4-pyframe:lz4-pyframe",

eden/mononoke/mercurial/revlog/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ futures_ext = { package = "futures_01_ext", version = "0.1.0", git = "https://gi
2020
futures_old = { package = "futures", version = "0.1.31" }
2121
memmap2 = "0.9.5"
2222
mercurial_types = { version = "0.1.0", path = "../types" }
23-
nom = "7.1"
23+
nom = "8"
2424
sapling-lz4-pyframe = { version = "0.1.0", path = "../../../scm/lib/lz4-pyframe" }
2525
thiserror = "2.0.12"
2626

eden/mononoke/mercurial/revlog/revlog/parser.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use mercurial_types::bdiff::Delta;
1717
use nom::Err;
1818
use nom::IResult;
1919
use nom::Needed;
20+
use nom::Parser as _;
2021
use nom::branch::alt;
2122
use nom::bytes::streaming::tag;
2223
use 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> {
201202
pub 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
216217
fn 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

Comments
 (0)