X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibserialize%2Fopaque.rs;h=e808d9819986f1c55cfd2e0cc7acdfd77d954974;hb=6d3f4e0aab3e36ceb8b83d1e9467514685f6b751;hp=75988198eb9b5f98174a98913347f58d09f9fae2;hpb=25640092c7ca5f0e980d24f2024fab8dd4ae718e;p=rust.git diff --git a/src/libserialize/opaque.rs b/src/libserialize/opaque.rs index 75988198eb9..e808d981998 100644 --- a/src/libserialize/opaque.rs +++ b/src/libserialize/opaque.rs @@ -31,14 +31,14 @@ macro_rules! write_uleb128 { ($enc:expr, $value:expr, $fun:ident) => {{ leb128::$fun(&mut $enc.data, $value); Ok(()) - }} + }}; } macro_rules! write_sleb128 { ($enc:expr, $value:expr) => {{ write_signed_leb128(&mut $enc.data, $value as i128); Ok(()) - }} + }}; } impl serialize::Encoder for Encoder { @@ -113,11 +113,7 @@ fn emit_i8(&mut self, v: i8) -> EncodeResult { #[inline] fn emit_bool(&mut self, v: bool) -> EncodeResult { - self.emit_u8(if v { - 1 - } else { - 0 - }) + self.emit_u8(if v { 1 } else { 0 }) } #[inline] @@ -164,10 +160,7 @@ pub struct Decoder<'a> { impl<'a> Decoder<'a> { #[inline] pub fn new(data: &'a [u8], position: usize) -> Decoder<'a> { - Decoder { - data, - position, - } + Decoder { data, position } } #[inline] @@ -199,22 +192,21 @@ pub fn read_raw_bytes(&mut self, s: &mut [u8]) -> Result<(), String> { } macro_rules! read_uleb128 { - ($dec:expr, $t:ty, $fun:ident) => ({ - let (value, bytes_read) = leb128::$fun(&$dec.data[$dec.position ..]); + ($dec:expr, $t:ty, $fun:ident) => {{ + let (value, bytes_read) = leb128::$fun(&$dec.data[$dec.position..]); $dec.position += bytes_read; Ok(value) - }) + }}; } macro_rules! read_sleb128 { - ($dec:expr, $t:ty) => ({ + ($dec:expr, $t:ty) => {{ let (value, bytes_read) = read_signed_leb128($dec.data, $dec.position); $dec.position += bytes_read; Ok(value as $t) - }) + }}; } - impl<'a> serialize::Decoder for Decoder<'a> { type Error = String;