Skip to content

Commit d3caa54

Browse files
committed
use new nanoserde version
1 parent 80e78bc commit d3caa54

File tree

6 files changed

+18
-25
lines changed

6 files changed

+18
-25
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ categories = ["compression"]
1010
rust-version = "1.82.0"
1111

1212
[dependencies]
13-
nanoserde = { version = "^0.1.37", optional = true }
13+
nanoserde = { version = "^0.2", optional = true }
1414
rustc-hash = { version = "1.1.0", optional = true }
1515
serde = { version = "^1.0.0", optional = true, features = ["derive"] }
1616
structdiff-derive = { path = "derive", version = "=0.7.4" }

derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "MIT"
1010
proc-macro = true
1111

1212
[dependencies]
13-
nanoserde = { version = "^0.1.37", optional = true }
13+
nanoserde = { version = "^0.2", optional = true }
1414
serde = { version = "^1.0.0", optional = true, features = ["derive"] }
1515

1616
[features]

src/collections/ordered_array_like.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -691,11 +691,10 @@ mod nanoserde_impls {
691691
let r = <usize as DeBin>::de_bin(offset, bytes)?;
692692
Ok(OrderedArrayLikeChangeOwned::Swap(l, r))
693693
}
694-
_ => Err(nanoserde::DeBinErr {
695-
o: *offset - 1,
696-
l: 1,
697-
s: 1,
698-
}),
694+
unknown => Err(nanoserde::DeBinErr {
695+
o: *offset,
696+
msg: nanoserde::DeBinErrReason::UnknownDiscriminant(unknown as isize),
697+
})
699698
}
700699
}
701700
}

src/collections/unordered_array_like.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -501,11 +501,10 @@ mod nanoserde_impls {
501501
3_u8 => UnorderedArrayLikeChange::RemoveFew(DeBin::de_bin(offset, bytes)?),
502502
4_u8 => UnorderedArrayLikeChange::InsertSingle(DeBin::de_bin(offset, bytes)?),
503503
5_u8 => UnorderedArrayLikeChange::RemoveSingle(DeBin::de_bin(offset, bytes)?),
504-
_ => {
504+
unknown => {
505505
return core::result::Result::Err(nanoserde::DeBinErr {
506506
o: *offset,
507-
l: 0,
508-
s: bytes.len(),
507+
msg: nanoserde::DeBinErrReason::UnknownDiscriminant(unknown as isize),
509508
})
510509
}
511510
})
@@ -537,11 +536,10 @@ mod nanoserde_impls {
537536
}
538537
UnorderedArrayLikeDiff(UnorderedArrayLikeDiffInternal::Modify(contents))
539538
}
540-
_ => {
539+
unknown => {
541540
return core::result::Result::Err(nanoserde::DeBinErr {
542541
o: *offset,
543-
l: 0,
544-
s: bytes.len(),
542+
msg: nanoserde::DeBinErrReason::UnknownDiscriminant(unknown as isize),
545543
})
546544
}
547545
})

src/collections/unordered_map_like.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,11 +470,10 @@ mod nanoserde_impls {
470470
DeBin::de_bin(offset, bytes)?,
471471
),
472472
3_u8 => UnorderedMapLikeChange::RemoveSingle(DeBin::de_bin(offset, bytes)?),
473-
_ => {
473+
unknown => {
474474
return core::result::Result::Err(nanoserde::DeBinErr {
475475
o: *offset,
476-
l: 0,
477-
s: bytes.len(),
476+
msg: nanoserde::DeBinErrReason::UnknownDiscriminant(unknown as isize),
478477
})
479478
}
480479
})
@@ -510,11 +509,10 @@ mod nanoserde_impls {
510509
}
511510
UnorderedMapLikeDiff(UnorderedMapLikeDiffInternal::Modify(contents))
512511
}
513-
_ => {
512+
unknown => {
514513
return core::result::Result::Err(nanoserde::DeBinErr {
515514
o: *offset,
516-
l: 0,
517-
s: bytes.len(),
515+
msg: nanoserde::DeBinErrReason::UnknownDiscriminant(unknown as isize),
518516
})
519517
}
520518
})

src/collections/unordered_map_like_recursive.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,10 @@ mod nanoserde_impls {
432432
0_u8 => UnorderedMapLikeRecursiveChangeOwned::Insert(DeBin::de_bin(offset, bytes)?),
433433
1_u8 => UnorderedMapLikeRecursiveChangeOwned::Remove(DeBin::de_bin(offset, bytes)?),
434434
2_u8 => UnorderedMapLikeRecursiveChangeOwned::Change(DeBin::de_bin(offset, bytes)?),
435-
_ => {
435+
unknown => {
436436
return core::result::Result::Err(nanoserde::DeBinErr {
437437
o: *offset,
438-
l: 0,
439-
s: bytes.len(),
438+
msg: nanoserde::DeBinErrReason::UnknownDiscriminant(unknown as isize),
440439
})
441440
}
442441
})
@@ -464,11 +463,10 @@ mod nanoserde_impls {
464463
offset, bytes,
465464
)?),
466465
),
467-
_ => {
466+
unknown => {
468467
return core::result::Result::Err(nanoserde::DeBinErr {
469468
o: *offset,
470-
l: 0,
471-
s: bytes.len(),
469+
msg: nanoserde::DeBinErrReason::UnknownDiscriminant(unknown as isize),
472470
})
473471
}
474472
})

0 commit comments

Comments
 (0)