chore(rustfmt): lints

server/src/builder.rs

@@ -271,7 +271,7 @@ async fn build_edge(
         refresher_mode,
         client_meta_information,
         args.delta,
-        args.delta_diff
+        args.delta_diff,
     );
     let feature_refresher = Arc::new(FeatureRefresher::new(
         unleash_client,

server/src/feature_cache.rs

@@ -1,11 +1,11 @@
+use crate::types::EdgeToken;
 use dashmap::DashMap;
 use tokio::sync::broadcast;
+use unleash_types::client_features::ClientFeaturesDelta;
 use unleash_types::{
     client_features::{ClientFeature, ClientFeatures, Segment},
     Deduplicate,
 };
-use unleash_types::client_features::ClientFeaturesDelta;
-use crate::types::EdgeToken;
 
 #[derive(Debug, Clone)]
 pub enum UpdateType {

server/src/http/refresher/delta_refresher.rs

@@ -1,18 +1,20 @@
-use std::time::Duration;
-use eventsource_client::Client;
 use actix_web::http::header::EntityTag;
-use reqwest::StatusCode;
+use eventsource_client::Client;
 use futures::TryStreamExt;
+use reqwest::StatusCode;
+use std::time::Duration;
 use tracing::{debug, info, warn};
-use unleash_types::client_features::{ClientFeaturesDelta};
+use unleash_types::client_features::ClientFeaturesDelta;
 use unleash_yggdrasil::EngineState;
 
 use crate::error::{EdgeError, FeatureError};
-use crate::http::headers::{UNLEASH_APPNAME_HEADER, UNLEASH_CLIENT_SPEC_HEADER, UNLEASH_INSTANCE_ID_HEADER};
-use crate::types::{ClientFeaturesDeltaResponse, ClientFeaturesRequest, EdgeToken, TokenRefresh};
+use crate::http::headers::{
+    UNLEASH_APPNAME_HEADER, UNLEASH_CLIENT_SPEC_HEADER, UNLEASH_INSTANCE_ID_HEADER,
+};
 use crate::http::refresher::feature_refresher::FeatureRefresher;
 use crate::http::unleash_client::ClientMetaInformation;
 use crate::tokens::cache_key;
+use crate::types::{ClientFeaturesDeltaResponse, ClientFeaturesRequest, EdgeToken, TokenRefresh};
 
 impl FeatureRefresher {
     async fn handle_client_features_delta_updated(
@@ -230,6 +232,10 @@ impl FeatureRefresher {
 
 #[cfg(test)]
 mod tests {
+    use crate::feature_cache::FeatureCache;
+    use crate::http::refresher::feature_refresher::FeatureRefresher;
+    use crate::http::unleash_client::{ClientMetaInformation, UnleashClient};
+    use crate::types::EdgeToken;
     use actix_http::header::IF_NONE_MATCH;
     use actix_http::HttpService;
     use actix_http_test::{test_server, TestServer};
@@ -240,11 +246,10 @@ mod tests {
     use chrono::Duration;
     use dashmap::DashMap;
     use std::sync::Arc;
-    use crate::feature_cache::FeatureCache;
-    use crate::http::refresher::feature_refresher::FeatureRefresher;
-    use crate::http::unleash_client::{ClientMetaInformation, UnleashClient};
-    use crate::types::EdgeToken;
-    use unleash_types::client_features::{ClientFeature, ClientFeatures, ClientFeaturesDelta, Constraint, DeltaEvent, Operator, Segment};
+    use unleash_types::client_features::{
+        ClientFeature, ClientFeatures, ClientFeaturesDelta, Constraint, DeltaEvent, Operator,
+        Segment,
+    };
     use unleash_yggdrasil::EngineState;
 
     #[actix_web::test]
@@ -265,7 +270,7 @@ mod tests {
             strict: false,
             streaming: false,
             delta: true,
-            delta_diff : false,
+            delta_diff: false,
             client_meta_information: ClientMetaInformation::test_config(),
         });
         let mut delta_features = ClientFeatures::create_from_delta(&revision(1));
@@ -359,7 +364,6 @@ mod tests {
         }
     }
 
-
     async fn return_client_features_delta(etag_header: Option<String>) -> HttpResponse {
         match etag_header {
             Some(value) => match value.as_str() {
@@ -389,10 +393,8 @@ mod tests {
                 ))),
                 |_| AppConfig::default(),
             ))
-                .tcp()
+            .tcp()
         })
-            .await
+        .await
     }
-
-
 }

server/src/http/refresher/feature_refresher.rs

@@ -19,7 +19,9 @@ use crate::filters::{filter_client_features, FeatureFilterSet};
 use crate::http::headers::{
     UNLEASH_APPNAME_HEADER, UNLEASH_CLIENT_SPEC_HEADER, UNLEASH_INSTANCE_ID_HEADER,
 };
-use crate::types::{build, ClientFeaturesDeltaResponse, EdgeResult, TokenType, TokenValidationStatus};
+use crate::types::{
+    build, ClientFeaturesDeltaResponse, EdgeResult, TokenType, TokenValidationStatus,
+};
 use crate::{
     persistence::EdgePersistence,
     tokens::{cache_key, simplify},
@@ -122,7 +124,7 @@ impl FeatureRefreshConfig {
             mode,
             client_meta_information,
             delta,
-            delta_diff
+            delta_diff,
         }
     }
 }
@@ -411,16 +413,13 @@ impl FeatureRefresher {
         if let Some(client_features) = self.features_cache.get(&key).as_ref() {
             if let Ok(ClientFeaturesDeltaResponse::Updated(delta_features, _etag)) = delta_result {
                 let c_features = &client_features.features;
-                let d_features = delta_features
-                    .events
-                    .iter()
-                    .find_map(|event| {
-                        if let DeltaEvent::Hydration { features, .. } = event {
-                            Some(features)
-                        } else {
-                            None
-                        }
-                    });
+                let d_features = delta_features.events.iter().find_map(|event| {
+                    if let DeltaEvent::Hydration { features, .. } = event {
+                        Some(features)
+                    } else {
+                        None
+                    }
+                });
 
                 let delta_json = serde_json::to_value(d_features).unwrap();
                 let client_json = serde_json::to_value(c_features).unwrap();
@@ -475,7 +474,6 @@ impl FeatureRefresher {
             } else {
                 self.refresh_single(refresh).await;
             }
-
         }
     }
 
@@ -1043,7 +1041,8 @@ mod tests {
         let example_features = features_from_disk("../examples/features.json");
         let cache_key = cache_key(&token);
         let mut engine_state = EngineState::default();
-        let warnings = engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
+        let warnings =
+            engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
         upstream_features_cache.insert(cache_key.clone(), example_features.clone());
         upstream_engine_cache.insert(cache_key.clone(), engine_state);
         let mut server = client_api_test_server(
@@ -1099,7 +1098,8 @@ mod tests {
         let example_features = features_from_disk("../examples/features.json");
         let cache_key = cache_key(&valid_token);
         let mut engine_state = EngineState::default();
-        let warnings = engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
+        let warnings =
+            engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
         upstream_features_cache.insert(cache_key.clone(), example_features.clone());
         upstream_engine_cache.insert(cache_key.clone(), engine_state);
         let server = client_api_test_server(
@@ -1144,7 +1144,8 @@ mod tests {
         let example_features = features_from_disk("../examples/hostedexample.json");
         let cache_key = cache_key(&dx_token);
         let mut engine_state = EngineState::default();
-        let warnings = engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
+        let warnings =
+            engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
         upstream_features_cache.insert(cache_key.clone(), example_features.clone());
         upstream_engine_cache.insert(cache_key.clone(), engine_state);
         let server = client_api_test_server(
@@ -1194,7 +1195,8 @@ mod tests {
         let cache_key = cache_key(&dx_token);
         upstream_features_cache.insert(cache_key.clone(), example_features.clone());
         let mut engine_state = EngineState::default();
-        let warnings = engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
+        let warnings =
+            engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
         upstream_engine_cache.insert(cache_key, engine_state);
         let server = client_api_test_server(
             upstream_token_cache,
@@ -1256,7 +1258,8 @@ mod tests {
         let cache_key = cache_key(&dx_token);
         upstream_features_cache.insert(cache_key.clone(), example_features.clone());
         let mut engine_state = EngineState::default();
-        let warnings = engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
+        let warnings =
+            engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
         upstream_engine_cache.insert(cache_key, engine_state);
         let server = client_api_test_server(
             upstream_token_cache,
@@ -1364,7 +1367,8 @@ mod tests {
         let cache_key = cache_key(&eg_token);
         upstream_features_cache.insert(cache_key.clone(), example_features.clone());
         let mut engine_state = EngineState::default();
-        let warnings = engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
+        let warnings =
+            engine_state.take_state(UpdateMessage::FullResponse(example_features.clone()));
         upstream_engine_cache.insert(cache_key.clone(), engine_state);
         let server = client_api_test_server(
             upstream_token_cache,

server/src/http/refresher/mod.rs

@@ -1,2 +1,2 @@
-pub mod feature_refresher;
 pub mod delta_refresher;
+pub mod feature_refresher;

server/src/main.rs

@@ -1,5 +1,3 @@
-use actix_cors::Cors;
-use std::sync::Arc;
 use actix_middleware_etag::Etag;
 use actix_web::middleware::Logger;
 use actix_web::{web, App, HttpServer};

server/src/metrics/client_metrics.rs

@@ -106,9 +106,7 @@ pub struct MetricsCache {
 }
 
 pub(crate) fn size_of_batch(batch: &MetricsBatch) -> usize {
-    serde_json::to_string(batch)
-        .map(|s| s.len())
-        .unwrap_or(0)
+    serde_json::to_string(batch).map(|s| s.len()).unwrap_or(0)
 }
 
 pub(crate) fn register_client_application(

server/src/types.rs

@@ -15,8 +15,8 @@ use chrono::{DateTime, Duration, Utc};
 use dashmap::DashMap;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use shadow_rs::shadow;
-use unleash_types::client_features::{ClientFeatures, ClientFeaturesDelta};
 use unleash_types::client_features::Context;
+use unleash_types::client_features::{ClientFeatures, ClientFeaturesDelta};
 use unleash_types::client_metrics::{ClientApplication, ClientMetricsEnv};
 use unleash_yggdrasil::EngineState;
 use utoipa::{IntoParams, ToSchema};

server/tests/streaming_test.rs

@@ -212,7 +212,7 @@ mod streaming_test {
                 strict: true,
                 dynamic: false,
                 delta: false,
-                delta_diff:false,
+                delta_diff: false,
                 prometheus_remote_write_url: None,
                 prometheus_push_interval: 60,
                 prometheus_username: None,