cargo fmt

Author: DavidBM

benches/my_benchmark.rs

@@ -1,5 +1,5 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use ion_binary_rs::{IonParser, IonEncoder};
+use ion_binary_rs::{IonEncoder, IonParser};
 
 fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("ion decode simple", |b| {
@@ -41,7 +41,9 @@ fn criterion_benchmark(c: &mut Criterion) {
         };
 
         b.iter(|| {
-            bson::raw::RawDocumentBuf::from_document(&doc.clone()).unwrap().into_bytes()
+            bson::raw::RawDocumentBuf::from_document(&doc.clone())
+                .unwrap()
+                .into_bytes()
         })
     });
 }

src/binary_encoder.rs

@@ -428,7 +428,6 @@ pub fn encode_varint(value: &[u8], is_negative: bool) -> Vec<u8> {
 }
 
 pub fn encode_var(input: &[u8]) -> Vec<u8> {
-
     if input.is_empty() {
         return vec![];
     }
@@ -537,7 +536,7 @@ pub fn encode_var(input: &[u8]) -> Vec<u8> {
         }
     }
 
-    // Output len was all iterated as the loop breaks on 
+    // Output len was all iterated as the loop breaks on
     // output_index == 0 and it started as output_len - 1
     unsafe {
         buffer_output.set_len(output_len);

src/binary_parser_types.rs

@@ -66,7 +66,6 @@ pub enum ValueType {
 }
 
 impl TryFrom<u8> for ValueType {
-
     type Error = ParsingError;
 
     fn try_from(id: u8) -> Result<Self, ParsingError> {
@@ -125,8 +124,12 @@ pub enum ParsingError {
 impl PartialEq for ParsingError {
     fn eq(&self, input: &ParsingError) -> bool {
         match (self, input) {
-            (ParsingError::ErrorReadingData(a), ParsingError::ErrorReadingData(b)) if a.kind() == b.kind() => true,
-            (a, b) => a == b
+            (ParsingError::ErrorReadingData(a), ParsingError::ErrorReadingData(b))
+                if a.kind() == b.kind() =>
+            {
+                true
+            }
+            (a, b) => a == b,
         }
     }
 }
@@ -152,7 +155,7 @@ impl ValueHeader {
 
     pub fn is_nop(&self) -> bool {
         let ion_type = self.get_type();
-        
+
         ion_type == ValueType::Null && self.get_len() < 15
     }
 
@@ -194,7 +197,7 @@ impl ValueHeader {
             13 => ValueType::Struct,
             14 => ValueType::Annotation,
             15 => ValueType::Reserved,
-            _ => panic!("Internal library bug")
+            _ => panic!("Internal library bug"),
         }
     }
 }

src/ion_parser.rs

@@ -98,11 +98,15 @@ impl<T: Read> IonParser<T> {
     }
 
     #[inline]
-    fn consume_value_body(&mut self, value_header: &ValueHeader, nested_level: u64) -> ConsumerResult {
+    fn consume_value_body(
+        &mut self,
+        value_header: &ValueHeader,
+        nested_level: u64,
+    ) -> ConsumerResult {
         if value_header.is_nop() {
             let consumed_bytes = self.consume_nop(value_header)?;
             let value = self.consume_value()?;
-            return Ok((value.0, value.1 + consumed_bytes))
+            return Ok((value.0, value.1 + consumed_bytes));
         }
 
         match value_header.get_type() {
@@ -178,7 +182,7 @@ impl<T: Read> IonParser<T> {
         }
 
         let (length, _, total) = self.consume_value_len(header)?;
-        // Not using the temp buffer because from_utf8 consumes the 
+        // Not using the temp buffer because from_utf8 consumes the
         // arguments and it would require a clone of a buffer that
         // might be bigger than required.
         let mut buffer = vec![0; length];
@@ -272,11 +276,13 @@ impl<T: Read> IonParser<T> {
 
             trace!("Struct key field: {:?}", key);
 
-            let value_header = self.parser.consume_value_header(nested_level.saturating_add(1))?;
+            let value_header = self
+                .parser
+                .consume_value_header(nested_level.saturating_add(1))?;
 
             consumed_bytes += 1;
 
-            if value_header.is_nop() {                
+            if value_header.is_nop() {
                 let consumed = self.consume_nop(&value_header)?;
                 trace!("Found NOP Padding in Struct of {:} bytes", consumed + 1);
                 consumed_bytes += consumed;
@@ -314,7 +320,9 @@ impl<T: Read> IonParser<T> {
         let mut values = vec![];
 
         while length - consumed_bytes > 0 {
-            let value_header = self.parser.consume_value_header(nested_level.saturating_add(1))?;
+            let value_header = self
+                .parser
+                .consume_value_header(nested_level.saturating_add(1))?;
 
             consumed_bytes += 1;
 
@@ -743,7 +751,6 @@ impl<T: Read> IonParser<T> {
             header.get_len().into()
         };
 
-
         let total = consumed_bytes + length;
 
         Ok((length, consumed_bytes, total))

src/lib.rs

@@ -9,11 +9,11 @@
 //!
 //! It **parses**, **encodes** and **hashes** anything you throw at it. Any failure to do so
 //! is a bug that we will fix and we will be very happy if you report them.
-//! 
+//!
 //! The code is mature and way more tested than Amazon's alternatives, including their js
 //! library. Amazon, when implementing the "good tests" only check that it parses. We check
-//! that the value is the correct one too. Additionally, we seem to be implementing way 
-//! more of the ion protocol than Amazon's libraries, as we don't have huge skip lists in 
+//! that the value is the correct one too. Additionally, we seem to be implementing way
+//! more of the ion protocol than Amazon's libraries, as we don't have huge skip lists in
 //! the tests files. We test all their test suite, not only a few test.
 //!
 //! ## How to use the library

src/tests/bad_tests/ion_parser_bad_others.rs

@@ -1,7 +1,7 @@
 use crate::read_file_testsuite;
 use crate::IonParserError;
 use crate::ParsingError;
-use crate::{ion_parser::IonParser, binary_parser_types::ValueLength};
+use crate::{binary_parser_types::ValueLength, ion_parser::IonParser};
 use bigdecimal::BigDecimal;
 use std::fs::File;
 use std::io::BufReader;
@@ -284,8 +284,8 @@ fn invalid_version_marker_in_annotation_wrapper() {
     let ion_element = read_file_testsuite!("bad/ivmInAnnotationWrapper");
     let mut parser = IonParser::new(ion_element);
     let value = parser.consume_value().unwrap_err();
-    // Note, this error should be "NestedVersionMarker", but the binary file 
-    // provided by amazon has a wrong length. 
+    // Note, this error should be "NestedVersionMarker", but the binary file
+    // provided by amazon has a wrong length.
     let expected = IonParserError::BinaryError(ParsingError::NoDataToRead);
     assert_eq!(expected, value);
 }

src/tests/binary_parser.rs

@@ -10,7 +10,7 @@ fn decode_value_null() {
 
     assert_eq!(
         lexer.consume_value_header(0),
-        Ok(ValueHeader::new(0/*Null Value*/ + 15/*Len for null Value*/).unwrap())
+        Ok(ValueHeader::new(0/*Null Value*/ + 15 /*Len for null Value*/).unwrap())
     );
 }
 
@@ -350,8 +350,6 @@ fn decode_value_with_version_header() {
 
     assert_eq!(
         lexer.consume_value_header(0),
-        Ok(ValueHeader::new(
-            (0xe << 4) /*Annotation*/ + 14 /*Long len*/
-        ).unwrap())
+        Ok(ValueHeader::new((0xe << 4) /*Annotation*/ + 14 /*Long len*/).unwrap())
     );
 }

src/tests/good_tests/ion_parser_good_struct.rs

@@ -116,13 +116,11 @@ fn struct_ordered_in_list() {
 
     assert_eq!(
         parser.consume_value().unwrap().0,
-        IonValue::List(vec![
-            IonValue::Struct(hashmap!(
-                "version".to_string() => IonValue::Bool(false),
-                "imports".to_string() => IonValue::Bool(true),
-                "name".to_string() => IonValue::Null(NullIonValue::Null)
-            ))
-        ])
+        IonValue::List(vec![IonValue::Struct(hashmap!(
+            "version".to_string() => IonValue::Bool(false),
+            "imports".to_string() => IonValue::Bool(true),
+            "name".to_string() => IonValue::Null(NullIonValue::Null)
+        ))])
     );
 }