Skip to content

Commit cce1d51

Browse files
committed
remove DeBin bound on some DiffRef helpers
1 parent 6a3366f commit cce1d51

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

src/collections/ordered_array_like.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,7 @@ mod nanoserde_impls {
695695
}
696696
_ => Err(nanoserde::DeBinErr {
697697
o: *offset - 1,
698-
l: 1,
699-
s: 1,
698+
msg: nanoserde::DeBinErrReason::Length { expected_length: 1, actual_length: 1 }
700699
}),
701700
}
702701
}

src/collections/unordered_array_like.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,7 @@ mod nanoserde_impls {
504504
_ => {
505505
return core::result::Result::Err(nanoserde::DeBinErr {
506506
o: *offset,
507-
l: 0,
508-
s: bytes.len(),
507+
msg: nanoserde::DeBinErrReason::Length { expected_length: 0, actual_length: bytes.len() }
509508
})
510509
}
511510
})
@@ -540,8 +539,7 @@ mod nanoserde_impls {
540539
_ => {
541540
return core::result::Result::Err(nanoserde::DeBinErr {
542541
o: *offset,
543-
l: 0,
544-
s: bytes.len(),
542+
msg: nanoserde::DeBinErrReason::Length { expected_length: 0, actual_length: bytes.len() }
545543
})
546544
}
547545
})

src/collections/unordered_map_like.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,7 @@ mod nanoserde_impls {
473473
_ => {
474474
return core::result::Result::Err(nanoserde::DeBinErr {
475475
o: *offset,
476-
l: 0,
477-
s: bytes.len(),
476+
msg: nanoserde::DeBinErrReason::Length { expected_length: 0, actual_length: bytes.len() }
478477
})
479478
}
480479
})
@@ -513,8 +512,7 @@ mod nanoserde_impls {
513512
_ => {
514513
return core::result::Result::Err(nanoserde::DeBinErr {
515514
o: *offset,
516-
l: 0,
517-
s: bytes.len(),
515+
msg: nanoserde::DeBinErrReason::Length { expected_length: 0, actual_length: bytes.len() }
518516
})
519517
}
520518
})

src/collections/unordered_map_like_recursive.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ mod nanoserde_impls {
342342

343343
impl<K, V> SerBin for UnorderedMapLikeRecursiveChangeRef<'_, K, V>
344344
where
345-
K: SerBin + PartialEq + Clone + DeBin,
346-
V: SerBin + PartialEq + Clone + DeBin + StructDiff,
345+
K: SerBin + PartialEq + Clone,
346+
V: SerBin + PartialEq + Clone + StructDiff,
347347
{
348348
fn ser_bin(&self, output: &mut Vec<u8>) {
349349
match self {
@@ -386,8 +386,8 @@ mod nanoserde_impls {
386386

387387
impl<K, V> SerBin for UnorderedMapLikeRecursiveDiffRef<'_, K, V>
388388
where
389-
K: SerBin + PartialEq + Clone + DeBin,
390-
V: SerBin + PartialEq + Clone + DeBin + StructDiff,
389+
K: SerBin + PartialEq + Clone,
390+
V: SerBin + PartialEq + Clone + StructDiff,
391391
{
392392
fn ser_bin(&self, output: &mut Vec<u8>) {
393393
match &self.0 {
@@ -409,8 +409,8 @@ mod nanoserde_impls {
409409

410410
impl<K, V> SerBin for &UnorderedMapLikeRecursiveDiffRef<'_, K, V>
411411
where
412-
K: SerBin + PartialEq + Clone + DeBin,
413-
V: SerBin + PartialEq + Clone + DeBin + StructDiff,
412+
K: SerBin + PartialEq + Clone,
413+
V: SerBin + PartialEq + Clone + StructDiff,
414414
{
415415
#[inline(always)]
416416
fn ser_bin(&self, output: &mut Vec<u8>) {
@@ -435,8 +435,7 @@ mod nanoserde_impls {
435435
_ => {
436436
return core::result::Result::Err(nanoserde::DeBinErr {
437437
o: *offset,
438-
l: 0,
439-
s: bytes.len(),
438+
msg: nanoserde::DeBinErrReason::Length { expected_length: 0, actual_length: bytes.len() }
440439
})
441440
}
442441
})
@@ -467,8 +466,7 @@ mod nanoserde_impls {
467466
_ => {
468467
return core::result::Result::Err(nanoserde::DeBinErr {
469468
o: *offset,
470-
l: 0,
471-
s: bytes.len(),
469+
msg: nanoserde::DeBinErrReason::Length { expected_length: 0, actual_length: bytes.len() }
472470
})
473471
}
474472
})

0 commit comments

Comments
 (0)