Skip to content

Commit

Permalink
Remove unused serialization functions
Browse files Browse the repository at this point in the history
  • Loading branch information
FreezyLemon authored and Luni-4 committed Apr 27, 2023
1 parent 7120e05 commit c2918a3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 52 deletions.
7 changes: 1 addition & 6 deletions src/serializer/cookie_utils.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use cookie_factory::bytes::{be_f64, be_i16, be_i8};
use cookie_factory::bytes::{be_f64, be_i16};
use cookie_factory::combinator::{skip, slice};
use cookie_factory::gen::legacy_wrap;
use cookie_factory::GenError;
Expand Down Expand Up @@ -89,11 +89,6 @@ pub(crate) fn gen_slice<'a, 'b>(
move |input| legacy_wrap(slice(v), input)
}

#[inline]
pub(crate) fn set_be_i8(x: (&mut [u8], usize), v: i8) -> Result<(&mut [u8], usize), GenError> {
legacy_wrap(be_i8(v), x)
}

#[inline]
pub(crate) fn set_be_i16(x: (&mut [u8], usize), v: i16) -> Result<(&mut [u8], usize), GenError> {
legacy_wrap(be_i16(v), x)
Expand Down
45 changes: 1 addition & 44 deletions src/serializer/ebml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ use cookie_factory::GenError;
use nom::AsBytes;

use crate::ebml::{Date, EbmlHeader};
use crate::serializer::cookie_utils::{
gen_at_offset, gen_skip, gen_slice, set_be_f64, set_be_i8, tuple,
};
use crate::serializer::cookie_utils::{gen_at_offset, gen_skip, gen_slice, set_be_f64, tuple};

const ALLOWED_ID_VALUES: u64 = (1u64 << 56) - 1;

Expand Down Expand Up @@ -93,32 +91,6 @@ pub(crate) fn gen_uint(
}
}

//FIXME: is it the right implementation?
pub(crate) fn gen_int(
num: i64,
) -> impl Fn((&mut [u8], usize)) -> Result<(&mut [u8], usize), GenError> {
move |mut input| {
let needed_bytes = vint_size(num as u64)?;

let mut i = needed_bytes - 1;
loop {
match set_be_i8((input.0, input.1), (num >> (i * 8)) as i8) {
Ok(next) => {
input = next;
}
Err(e) => return Err(e),
}

if i == 0 {
break;
}
i -= 1;
}

Ok(input)
}
}

fn gen_type<T: Copy, G>(
id: u32,
size: u64,
Expand Down Expand Up @@ -199,21 +171,6 @@ pub(crate) fn gen_ebml_uint(
gen_ebml_uint_l(id, num, move || vint_size(num))
}

pub(crate) fn gen_ebml_int(
id: u32,
num: i64,
) -> impl Fn((&mut [u8], usize)) -> Result<(&mut [u8], usize), GenError> {
move |input| {
let expected_size = vint_size(num as u64)?;
let needed_bytes = vint_size(expected_size as u64)?;

let (buf, ofs_len) = gen_vid(id)(input)?;
let (buf, start) = gen_skip(needed_bytes as usize)((buf, ofs_len))?;
let (buf, end) = gen_int(num)((buf, start))?;
gen_at_offset(ofs_len, gen_ebml_size(expected_size, end - start))((buf, end))
}
}

pub(crate) fn gen_ebml_str<'a, 'b>(
id: u32,
s: &'a str,
Expand Down
4 changes: 2 additions & 2 deletions src/serializer/elements.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use crate::{
},
serializer::cookie_utils::{gen_many, gen_opt, gen_opt_copy, set_be_i16, tuple},
serializer::ebml::{
gen_ebml_binary, gen_ebml_int, gen_ebml_master, gen_ebml_str, gen_ebml_uint,
gen_ebml_uint_l, gen_f64, gen_vid, gen_vint, vint_size, EbmlSize,
gen_ebml_binary, gen_ebml_master, gen_ebml_str, gen_ebml_uint, gen_ebml_uint_l, gen_f64,
gen_vid, gen_vint, vint_size, EbmlSize,
},
};

Expand Down

0 comments on commit c2918a3

Please sign in to comment.