Formatting

Author: madchicken

lib/src/graph.rs

@@ -2,7 +2,7 @@
 use {
     crate::connection::{ConnectionInfo, Routing},
     crate::graph::ConnectionPoolManager::Routed,
-    crate::routing::{RoutedConnectionManager, ClusterRoutingTableProvider},
+    crate::routing::{ClusterRoutingTableProvider, RoutedConnectionManager},
     log::debug,
 };
 
@@ -75,7 +75,10 @@ impl Graph {
             )?;
             if matches!(info.routing, Routing::Yes(_)) {
                 debug!("Routing enabled, creating a routed connection manager");
-                let pool = Routed(RoutedConnectionManager::new(&config, Box::new(ClusterRoutingTableProvider)).await?);
+                let pool = Routed(
+                    RoutedConnectionManager::new(&config, Box::new(ClusterRoutingTableProvider))
+                        .await?,
+                );
                 Ok(Graph {
                     config: config.into_live_config(),
                     pool,

lib/src/routing/connection_registry.rs

@@ -1,5 +1,6 @@
 use crate::connection::NeoUrl;
 use crate::pool::{create_pool, ConnectionPool};
+use crate::routing::routing_table_provider::RoutingTableProvider;
 use crate::routing::Server;
 use crate::{Config, Error};
 use dashmap::DashMap;
@@ -8,7 +9,6 @@ use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::Sender;
-use crate::routing::routing_table_provider::RoutingTableProvider;
 
 /// Represents a Bolt server, with its address, port and role.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -91,7 +91,7 @@ async fn refresh_routing_table(
                 uri,
                 ..config.clone()
             })
-                .await?,
+            .await?,
         );
     }
     registry.connections.retain(|k, _| servers.contains(k));
@@ -180,13 +180,13 @@ impl ConnectionRegistry {
 
 #[cfg(test)]
 mod tests {
-    use std::future::Future;
-    use std::pin::Pin;
     use super::*;
     use crate::auth::ConnectionTLSConfig;
     use crate::routing::load_balancing::LoadBalancingStrategy;
     use crate::routing::RoundRobinStrategy;
     use crate::routing::Server;
+    use std::future::Future;
+    use std::pin::Pin;
 
     struct TestRoutingTableProvider {
         routing_table: RoutingTable,
@@ -199,7 +199,10 @@ mod tests {
     }
 
     impl RoutingTableProvider for TestRoutingTableProvider {
-        fn fetch_routing_table(&self, _: &Config) -> Pin<Box<dyn Future<Output = Result<RoutingTable, Error>> + Send>> {
+        fn fetch_routing_table(
+            &self,
+            _: &Config,
+        ) -> Pin<Box<dyn Future<Output = Result<RoutingTable, Error>> + Send>> {
             let routing_table = self.routing_table.clone();
             Box::pin(async move { Ok(routing_table) })
         }
@@ -251,7 +254,15 @@ mod tests {
             tls_config: ConnectionTLSConfig::None,
         };
         let registry = Arc::new(ConnectionRegistry::default());
-        let ttl = refresh_routing_table(config.clone(), registry.clone(), Arc::new(Box::new(TestRoutingTableProvider::new(cluster_routing_table)))).await.unwrap();
+        let ttl = refresh_routing_table(
+            config.clone(),
+            registry.clone(),
+            Arc::new(Box::new(TestRoutingTableProvider::new(
+                cluster_routing_table,
+            ))),
+        )
+        .await
+        .unwrap();
         assert_eq!(ttl, 300);
         assert_eq!(registry.connections.len(), 5);
         let strategy = RoundRobinStrategy::default();

lib/src/routing/mod.rs

@@ -165,4 +165,4 @@ use crate::routing::connection_registry::BoltServer;
 use crate::{Database, Version};
 pub use load_balancing::round_robin_strategy::RoundRobinStrategy;
 pub use routed_connection_manager::RoutedConnectionManager;
-pub use routing_table_provider::ClusterRoutingTableProvider;
+pub use routing_table_provider::ClusterRoutingTableProvider;

lib/src/routing/routed_connection_manager.rs

@@ -1,6 +1,9 @@
 use crate::pool::ManagedConnection;
-use crate::routing::connection_registry::{start_background_updater, BoltServer, ConnectionRegistry, RegistryCommand};
+use crate::routing::connection_registry::{
+    start_background_updater, BoltServer, ConnectionRegistry, RegistryCommand,
+};
 use crate::routing::load_balancing::LoadBalancingStrategy;
+use crate::routing::routing_table_provider::RoutingTableProvider;
 use crate::routing::RoundRobinStrategy;
 #[cfg(feature = "unstable-bolt-protocol-impl-v2")]
 use crate::{Config, Error, Operation};
@@ -10,7 +13,6 @@ use log::{debug, error};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::mpsc::Sender;
-use crate::routing::routing_table_provider::RoutingTableProvider;
 
 #[derive(Clone)]
 pub struct RoutedConnectionManager {
@@ -23,7 +25,10 @@ pub struct RoutedConnectionManager {
 }
 
 impl RoutedConnectionManager {
-    pub async fn new(config: &Config, provider: Box<dyn RoutingTableProvider>) -> Result<Self, Error> {
+    pub async fn new(
+        config: &Config,
+        provider: Box<dyn RoutingTableProvider>,
+    ) -> Result<Self, Error> {
         let backoff = Arc::new(
             ExponentialBackoffBuilder::new()
                 .with_initial_interval(Duration::from_millis(1))
@@ -34,7 +39,8 @@ impl RoutedConnectionManager {
         );
 
         let connection_registry = Arc::new(ConnectionRegistry::default());
-        let channel = start_background_updater(config, connection_registry.clone(), provider.into()).await;
+        let channel =
+            start_background_updater(config, connection_registry.clone(), provider.into()).await;
         Ok(RoutedConnectionManager {
             load_balancing_strategy: Arc::new(RoundRobinStrategy::default()),
             bookmarks: Arc::new(Mutex::new(vec![])),

lib/src/routing/routing_table_provider.rs

@@ -1,8 +1,8 @@
-use std::future::Future;
-use std::pin::Pin;
-use crate::{Config, Error};
 use crate::connection::{Connection, ConnectionInfo};
 use crate::routing::{RouteBuilder, RoutingTable};
+use crate::{Config, Error};
+use std::future::Future;
+use std::pin::Pin;
 
 pub(crate) trait RoutingTableProvider: Send + Sync {
     fn fetch_routing_table(
@@ -31,8 +31,7 @@ impl RoutingTableProvider for ClusterRoutingTableProvider {
             if let Some(db) = config.db.clone() {
                 builder = builder.with_db(db);
             }
-            connection
-                .route(builder.build(connection.version())).await
+            connection.route(builder.build(connection.version())).await
         })
     }
-}
+}