squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

librbml: use unboxed closures in free functions

Browse source
This commit is contained in:
Jorge Aparicio 2014-12-06 17:44:01 -05:00
parent 807c5e8c8d
commit 594ff51b23
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/librbml/lib.rs
View file

@ -260,7 +260,9 @@ pub mod reader {
} }
} }
pub fn docs<'a>(d: Doc<'a>, it: |uint, Doc<'a>| -> bool) -> bool { pub fn docs<F>(d: Doc, mut it: F) -> bool where
F: FnMut(uint, Doc) -> bool,
{
let mut pos = d.start; let mut pos = d.start;
while pos < d.end { while pos < d.end {
let elt_tag = try_or!(vuint_at(d.data, pos), false); let elt_tag = try_or!(vuint_at(d.data, pos), false);
@ -274,7 +276,9 @@ pub mod reader {
return true; return true;
} }
pub fn tagged_docs<'a>(d: Doc<'a>, tg: uint, it: |Doc<'a>| -> bool) -> bool { pub fn tagged_docs<F>(d: Doc, tg: uint, mut it: F) -> bool where
F: FnMut(Doc) -> bool,
{
let mut pos = d.start; let mut pos = d.start;
while pos < d.end { while pos < d.end {
let elt_tag = try_or!(vuint_at(d.data, pos), false); let elt_tag = try_or!(vuint_at(d.data, pos), false);
@ -291,7 +295,9 @@ pub mod reader {
return true; return true;
} }
pub fn with_doc_data<'a, T>(d: Doc<'a>, f: |x: &'a [u8]| -> T) -> T { pub fn with_doc_data<T, F>(d: Doc, f: F) -> T where
F: FnOnce(&[u8]) -> T,
{
f(d.data[d.start..d.end]) f(d.data[d.start..d.end])
} }
@ -399,8 +405,9 @@ pub mod reader {
Ok(r as uint) Ok(r as uint)
} }
pub fn read_opaque<R>(&mut self, pub fn read_opaque<R, F>(&mut self, op: F) -> DecodeResult<R> where
op: |&mut Decoder<'doc>, Doc| -> DecodeResult<R>) -> DecodeResult<R> { F: FnOnce(&mut Decoder, Doc) -> DecodeResult<R>,
{
let doc = try!(self.next_doc(EsOpaque)); let doc = try!(self.next_doc(EsOpaque));
let (old_parent, old_pos) = (self.parent, self.pos); let (old_parent, old_pos) = (self.parent, self.pos);
@ -761,7 +768,9 @@ pub mod writer {
Ok(r) Ok(r)
} }
pub fn wr_tag(&mut self, tag_id: uint, blk: || -> EncodeResult) -> EncodeResult { pub fn wr_tag<F>(&mut self, tag_id: uint, blk: F) -> EncodeResult where
F: FnOnce() -> EncodeResult,
{
try!(self.start_tag(tag_id)); try!(self.start_tag(tag_id));
try!(blk()); try!(blk());
self.end_tag() self.end_tag()
@ -857,7 +866,9 @@ pub mod writer {
else { Ok(()) } else { Ok(()) }
} }
pub fn emit_opaque(&mut self, f: |&mut Encoder<W>| -> EncodeResult) -> EncodeResult { pub fn emit_opaque<F>(&mut self, f: F) -> EncodeResult where
F: FnOnce(&mut Encoder<W>) -> EncodeResult,
{
try!(self.start_tag(EsOpaque as uint)); try!(self.start_tag(EsOpaque as uint));
try!(f(self)); try!(f(self));
self.end_tag() self.end_tag()