tangent128/webmetro
1
0
Fork 0
Code Issues 1 Pull requests Releases Packages Wiki Activity

Streamline adapting schema to source.

Browse source
This commit is contained in:
Tangent 128 2017-04-30 14:35:11 -04:00
parent 466f0c46f0
commit 13660fe802
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lib.rs
View file

@ -126,15 +126,19 @@ pub trait Schema<'a> {
} }
} }
fn parse<T>(self, source: T) -> Ebml<Self, T> where Self: Sized {
Ebml(self, source)
}
} }
pub const EBML_HEAD_ID: u64 = 0x0A45DFA3; pub const EBML_HEAD_ID: u64 = 0x0A45DFA3;
pub const VOID_ID: u64 = 0x6C; pub const VOID_ID: u64 = 0x6C;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub struct Ebml<'b, S: Schema<'b>, T: 'b>(S, &'b T); pub struct Ebml<S, T>(S, T);
impl<'b, S: Schema<'b>> IntoIterator for Ebml<'b, S, &'b[u8]> { impl<'b, S: Schema<'b>> IntoIterator for Ebml<S, &'b[u8]> {
type Item = S::Element; type Item = S::Element;
type IntoIter = EbmlIterator<'b, S>; type IntoIter = EbmlIterator<'b, S>;
@ -314,8 +318,7 @@ mod tests {
#[test] #[test]
fn decode_webm_test1() { fn decode_webm_test1() {
let source = &TEST_FILE; let mut iter = Webm.parse(TEST_FILE).into_iter();
let mut iter = Ebml(Webm, source).into_iter();
// test that we match the structure of the test file // test that we match the structure of the test file
assert_eq!(iter.next(), Some(WebmElement::EbmlHead)); assert_eq!(iter.next(), Some(WebmElement::EbmlHead));