Remove combine_control_expr

xgreenx · xgreenx · commit a3d321d10a59 · 2022-09-05T18:45:09.000+01:00
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -2,7 +2,6 @@ max_width = 90 # changed
 normalize_comments = true # changed
 imports_layout = "Vertical" # changed
 imports_granularity = "Crate" # changed
-combine_control_expr = false # changed
 trailing_semicolon = false # changed
 edition = "2021" # changed
 use_try_shorthand = true # changed
diff --git a/fuel-core/src/service/metrics.rs b/fuel-core/src/service/metrics.rs
@@ -1,7 +1,10 @@
 use axum::response::IntoResponse;
 #[cfg(feature = "metrics")]
 use fuel_metrics::core_metrics::encode_metrics_response;
-use hyper::{Body, Request};
+use hyper::{
+    Body,
+    Request,
+};
 
 pub async fn metrics(_req: Request<Body>) -> impl IntoResponse {
     #[cfg(feature = "metrics")]
diff --git a/fuel-core/src/state/rocks_db.rs b/fuel-core/src/state/rocks_db.rs
@@ -1,22 +1,42 @@
-use crate::state::KVItem;
 use crate::{
     database::{
         columns,
         columns::METADATA,
-        metadata::{DB_VERSION, DB_VERSION_KEY},
+        metadata::{
+            DB_VERSION,
+            DB_VERSION_KEY,
+        },
     },
     state::{
-        BatchOperations, ColumnId, Error, IterDirection, KeyValueStore, TransactableStorage,
+        BatchOperations,
+        ColumnId,
+        Error,
+        IterDirection,
+        KVItem,
+        KeyValueStore,
+        TransactableStorage,
         WriteOperation,
     },
 };
 #[cfg(feature = "metrics")]
 use fuel_metrics::core_metrics::DATABASE_METRICS;
 use rocksdb::{
-    BoundColumnFamily, ColumnFamilyDescriptor, DBCompressionType, DBWithThreadMode, IteratorMode,
-    MultiThreaded, Options, ReadOptions, SliceTransform, WriteBatch,
+    BoundColumnFamily,
+    ColumnFamilyDescriptor,
+    DBCompressionType,
+    DBWithThreadMode,
+    IteratorMode,
+    MultiThreaded,
+    Options,
+    ReadOptions,
+    SliceTransform,
+    WriteBatch,
+};
+use std::{
+    convert::TryFrom,
+    path::Path,
+    sync::Arc,
 };
-use std::{convert::TryFrom, path::Path, sync::Arc};
 
 type DB = DBWithThreadMode<MultiThreaded>;
 #[derive(Debug)]
@@ -66,11 +86,11 @@ impl RocksDb {
                 )?;
             }
             Some(v) => {
-                let b =
-                    <[u8; 4]>::try_from(v.as_slice()).map_err(|_| Error::InvalidDatabaseVersion)?;
+                let b = <[u8; 4]>::try_from(v.as_slice())
+                    .map_err(|_| Error::InvalidDatabaseVersion)?;
                 let version = u32::from_be_bytes(b);
                 if version != DB_VERSION {
-                    return Err(Error::InvalidDatabaseVersion);
+                    return Err(Error::InvalidDatabaseVersion)
                 }
             }
         };
@@ -144,7 +164,11 @@ impl KeyValueStore for RocksDb {
             .map(|_| prev)
     }
 
-    fn delete(&self, key: &[u8], column: ColumnId) -> crate::state::Result<Option<Vec<u8>>> {
+    fn delete(
+        &self,
+        key: &[u8],
+        column: ColumnId,
+    ) -> crate::state::Result<Option<Vec<u8>>> {
         let prev = self.get(key, column)?;
         self.db
             .delete_cf(&self.cf(column), key)
@@ -228,7 +252,10 @@ impl KeyValueStore for RocksDb {
 }
 
 impl BatchOperations for RocksDb {
-    fn batch_write(&self, entries: &mut dyn Iterator<Item = WriteOperation>) -> Result<(), Error> {
+    fn batch_write(
+        &self,
+        entries: &mut dyn Iterator<Item = WriteOperation>,
+    ) -> Result<(), Error> {
         let mut batch = WriteBatch::default();
 
         for entry in entries {
diff --git a/fuel-metrics/src/core_metrics.rs b/fuel-metrics/src/core_metrics.rs
@@ -1,8 +1,17 @@
 use axum::response::IntoResponse;
-use hyper::{header::CONTENT_TYPE, Body, Response};
+use hyper::{
+    header::CONTENT_TYPE,
+    Body,
+    Response,
+};
 use lazy_static::lazy_static;
-use prometheus::register_int_counter;
-use prometheus::{self, Encoder, IntCounter, TextEncoder};
+use prometheus::{
+    self,
+    register_int_counter,
+    Encoder,
+    IntCounter,
+    TextEncoder,
+};
 
 /// DatabaseMetrics is a wrapper struct for all
 /// of the initialized counters for Database-related metrics
@@ -16,9 +25,13 @@ pub struct DatabaseMetrics {
 
 lazy_static! {
     pub static ref DATABASE_METRICS: DatabaseMetrics = DatabaseMetrics {
-        write_meter: register_int_counter!("Writes", "Number of database write operations")
+        write_meter: register_int_counter!(
+            "Writes",
+            "Number of database write operations"
+        )
+        .unwrap(),
+        read_meter: register_int_counter!("Reads", "Number of database read operations")
             .unwrap(),
-        read_meter: register_int_counter!("Reads", "Number of database read operations").unwrap(),
         bytes_written_meter: register_int_counter!(
             "Bytes_Written",
             "The number of bytes written to the database"
@@ -43,8 +56,11 @@ pub struct CoreMetrics {
 
 lazy_static! {
     pub static ref CORE_METRICS: CoreMetrics = CoreMetrics {
-        blocks_processed: register_int_counter!("Blocks_Processed", "Number of blocks processed")
-            .unwrap(),
+        blocks_processed: register_int_counter!(
+            "Blocks_Processed",
+            "Number of blocks processed"
+        )
+        .unwrap(),
         transactions_executed: register_int_counter!(
             "Transactions_Processed",
             "Number of transactions executed"
