berkus
/
bincode-orig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Encode variant index instead of variant value (#593)

This commit is contained in:
trevyn 2022-10-18 13:56:53 +04:00 committed by GitHub
parent 620078dc8b
commit 966c45544f
5 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
derive/Cargo.toml
View File

@ -19,4 +19,4 @@ description = "Implementation of #[derive(Encode, Decode)] for bincode"
proc-macro = true proc-macro = true
[dependencies] [dependencies]
virtue = "0.0.9" virtue = "0.0.10"

17
derive/src/derive_enum.rs
View File

@ -12,7 +12,6 @@ impl DeriveEnum {
fn iter_fields(&self) -> EnumVariantIterator { fn iter_fields(&self) -> EnumVariantIterator {
EnumVariantIterator { EnumVariantIterator {
idx: 0, idx: 0,
last_val: None,
variants: &self.variants, variants: &self.variants,
} }
} }
@ -401,7 +400,6 @@ impl DeriveEnum {
struct EnumVariantIterator<'a> { struct EnumVariantIterator<'a> {
variants: &'a [EnumVariant], variants: &'a [EnumVariant],
idx: usize, idx: usize,
last_val: Option<(Literal, u32)>,
} }
impl<'a> Iterator for EnumVariantIterator<'a> { impl<'a> Iterator for EnumVariantIterator<'a> {
@ -412,20 +410,7 @@ impl<'a> Iterator for EnumVariantIterator<'a> {
let variant = self.variants.get(self.idx)?; let variant = self.variants.get(self.idx)?;
self.idx += 1; self.idx += 1;
let tokens = if let Fields::Integer(lit) = &variant.fields { let tokens = vec![TokenTree::Literal(Literal::u32_suffixed(idx as u32))];
let tree = TokenTree::Literal(lit.clone());
self.last_val = Some((lit.clone(), 0));
vec![tree]
} else if let Some((lit, add)) = self.last_val.as_mut() {
*add += 1;
vec![
TokenTree::Literal(lit.clone()),
TokenTree::Punct(Punct::new('+', Spacing::Alone)),
TokenTree::Literal(Literal::u32_suffixed(*add)),
]
} else {
vec![TokenTree::Literal(Literal::u32_suffixed(idx as u32))]
};
Some((tokens, variant)) Some((tokens, variant))
} }

28
tests/derive.rs
View File

@ -255,7 +255,7 @@ fn test_decode_borrowed_enum_tuple_variant() {
#[derive(bincode::Decode, bincode::Encode, PartialEq, Eq, Debug)] #[derive(bincode::Decode, bincode::Encode, PartialEq, Eq, Debug)]
enum CStyleEnum { enum CStyleEnum {
A = 1, A = -1,
B = 2, B = 2,
C, C,
D = 5, D = 5,
@ -272,11 +272,11 @@ fn test_c_style_enum() {
slice[0] slice[0]
} }
assert_eq!(ser(CStyleEnum::A), 1); assert_eq!(ser(CStyleEnum::A), 0);
assert_eq!(ser(CStyleEnum::B), 2); assert_eq!(ser(CStyleEnum::B), 1);
assert_eq!(ser(CStyleEnum::C), 3); assert_eq!(ser(CStyleEnum::C), 2);
assert_eq!(ser(CStyleEnum::D), 5); assert_eq!(ser(CStyleEnum::D), 3);
assert_eq!(ser(CStyleEnum::E), 6); assert_eq!(ser(CStyleEnum::E), 4);
fn assert_de_successfully(num: u8, expected: CStyleEnum) { fn assert_de_successfully(num: u8, expected: CStyleEnum) {
match bincode::decode_from_slice::<CStyleEnum, _>(&[num], bincode::config::standard()) { match bincode::decode_from_slice::<CStyleEnum, _>(&[num], bincode::config::standard()) {
@ -295,21 +295,19 @@ fn test_c_style_enum() {
} }
Err(DecodeError::UnexpectedVariant { Err(DecodeError::UnexpectedVariant {
type_name: "CStyleEnum", type_name: "CStyleEnum",
allowed: &bincode::error::AllowedEnumVariants::Allowed(&[1, 2, 3, 5, 6]), allowed: &bincode::error::AllowedEnumVariants::Allowed(&[0, 1, 2, 3, 4]),
found, found,
}) if found == num as u32 => {} }) if found == num as u32 => {}
Err(e) => panic!("Expected DecodeError::UnexpectedVariant, got {e:?}"), Err(e) => panic!("Expected DecodeError::UnexpectedVariant, got {e:?}"),
} }
} }
assert_de_fails(0); assert_de_successfully(0, CStyleEnum::A);
assert_de_successfully(1, CStyleEnum::A); assert_de_successfully(1, CStyleEnum::B);
assert_de_successfully(2, CStyleEnum::B); assert_de_successfully(2, CStyleEnum::C);
assert_de_successfully(3, CStyleEnum::C); assert_de_successfully(3, CStyleEnum::D);
assert_de_fails(4); assert_de_successfully(4, CStyleEnum::E);
assert_de_successfully(5, CStyleEnum::D); assert_de_fails(5);
assert_de_successfully(6, CStyleEnum::E);
assert_de_fails(7);
} }
macro_rules! macro_newtype { macro_rules! macro_newtype {

3
tests/issues.rs
View File

@ -32,3 +32,6 @@ mod issue_547;
#[path = "issues/issue_570.rs"] #[path = "issues/issue_570.rs"]
mod issue_570; mod issue_570;
#[path = "issues/issue_592.rs"]
mod issue_592;

8
tests/issues/issue_592.rs Normal file
View File

@ -0,0 +1,8 @@
#![cfg(all(feature = "derive", feature = "std"))]
use bincode::{Decode, Encode};
#[derive(Encode, Decode)]
pub enum TypeOfFile {
Unknown = -1,
}