cargofmt and clippy

Signed-off-by: Jakub Sztandera <[email protected]>

Author: Kubuxu

ipld/bitfield/benches/benchmarks/main.rs

@@ -5,6 +5,7 @@ mod examples;
 
 use std::fs;
 use std::path::Path;
+
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use examples::{example1, example2};
 use fvm_ipld_bitfield::BitField;
@@ -15,7 +16,7 @@ struct Profiler;
 impl criterion::profiler::Profiler for Profiler {
     fn start_profiling(&mut self, benchmark_id: &str, benchmark_dir: &Path) {
         fs::create_dir_all(benchmark_dir).unwrap();
-        let bench_file =benchmark_id.to_owned() + ".prof";
+        let bench_file = benchmark_id.to_owned() + ".prof";
         let bench_path = benchmark_dir.join(bench_file);
         let bench_str = bench_path.to_str().unwrap();
 
@@ -28,10 +29,9 @@ impl criterion::profiler::Profiler for Profiler {
 }
 
 fn profiled() -> Criterion {
-    Criterion::default().with_profiler(Profiler{})
+    Criterion::default().with_profiler(Profiler {})
 }
 
-
 fn len(c: &mut Criterion) {
     let bf = example1();
     c.bench_function("len", |b| b.iter(|| black_box(&bf).len()));
@@ -54,9 +54,7 @@ fn decode_encode(c: &mut Criterion) {
     });
 }
 fn decode(c: &mut Criterion) {
-    c.bench_function("decode", |b| {
-        b.iter(|| example1())
-    });
+    c.bench_function("decode", |b| b.iter(|| example1()));
 }
 
 fn from_ranges(c: &mut Criterion) {

ipld/bitfield/src/rleplus/reader.rs

@@ -31,7 +31,7 @@ impl<'a> BitReader<'a> {
         let mut bits = 0u64;
         for i in 0..2 {
             let byte = bytes.get(i).unwrap_or(&0);
-            bits |= (*byte as u64) << (8*i);
+            bits |= (*byte as u64) << (8 * i);
         }
 
         let bytes = bytes.get(2..).unwrap_or(&[]);
@@ -62,7 +62,6 @@ impl<'a> BitReader<'a> {
         self.bits >>= num_bits;
         self.num_bits -= num_bits;
 
-
         // not sure why this being outside of the if improves the performance
         // bit it does, probably related to keeping caches warm
         let byte = self.bytes.get(0).unwrap_or(&0);
@@ -122,28 +121,26 @@ impl<'a> BitReader<'a> {
 
         let peek6 = self.peek(6);
 
-        let len = if peek6 & 0b1 != 0 {
+        let len = if peek6 & 0b01 != 0 {
             // Block Single (prefix 1)
             self.drop(1);
             1
+        } else if peek6 & 0b10 != 0 {
+            // Block Short (prefix 01)
+            let val = ((peek6 >> 2) & 0x0f) as u64;
+            self.drop(6);
+            if val < 2 {
+                return Err(Error::NotMinimal);
+            }
+            val
         } else {
-            if peek6 & 0b10 != 0 {
-                // Block Short (prefix 01)
-                let val = ((peek6 >> 2) & 0x0f) as u64;
-                self.drop(6);
-                if val < 2 {
-                    return Err(Error::NotMinimal);
-                }
-                val
-            } else {
-                // Block Long (prefix 00)
-                self.drop(2);
-                let val = self.read_varint()?;
-                if val < 16 {
-                    return Err(Error::NotMinimal);
-                }
-                val
+            // Block Long (prefix 00)
+            self.drop(2);
+            let val = self.read_varint()?;
+            if val < 16 {
+                return Err(Error::NotMinimal);
             }
+            val
         };
 
         Ok(Some(len))