From 10369a0bd4b6139709aeb144ea23a6a51fa56a54 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Tue, 29 Oct 2024 13:12:26 +0200 Subject: [PATCH] chore: add autoformatting config (#156) --- .github/workflows/sarif-and-test.yaml | 2 + rustfmt.toml | 0 unleash-yggdrasil/src/lib.rs | 5 +- unleash-yggdrasil/src/strategy_parsing.rs | 1 - unleash-yggdrasil/src/strategy_upgrade.rs | 5 +- yggdrasilwasm/src/lib.rs | 93 ++++++++++++++--------- 6 files changed, 65 insertions(+), 41 deletions(-) create mode 100644 rustfmt.toml diff --git a/.github/workflows/sarif-and-test.yaml b/.github/workflows/sarif-and-test.yaml index 01d9e346..af72f464 100644 --- a/.github/workflows/sarif-and-test.yaml +++ b/.github/workflows/sarif-and-test.yaml @@ -35,6 +35,8 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Install required cargo packages for reporting format run: cargo install clippy-sarif sarif-fmt + - name: Check formatting + run: cargo fmt -- --check - name: Run rust-clippy run: | cargo clippy --all-features --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..e69de29b diff --git a/unleash-yggdrasil/src/lib.rs b/unleash-yggdrasil/src/lib.rs index 8fea4131..d3aaa917 100644 --- a/unleash-yggdrasil/src/lib.rs +++ b/unleash-yggdrasil/src/lib.rs @@ -497,7 +497,8 @@ impl EngineState { } let total_weight: u32 = variants.iter().map(|var| var.weight as u32).sum(); - let stickiness = variants.first() + let stickiness = variants + .first() .and_then(|variant| variant.stickiness.clone()); let target = get_seed(stickiness, context) @@ -563,7 +564,7 @@ impl EngineState { self.get_toggle(name).map(|toggle| { if self.enabled(toggle, context, external_values) { self.check_variant_by_toggle(toggle, context) - .unwrap_or_default() + .unwrap_or_default() } else { VariantDef::default() } diff --git a/unleash-yggdrasil/src/strategy_parsing.rs b/unleash-yggdrasil/src/strategy_parsing.rs index d4c74b16..7bddcedd 100644 --- a/unleash-yggdrasil/src/strategy_parsing.rs +++ b/unleash-yggdrasil/src/strategy_parsing.rs @@ -381,7 +381,6 @@ fn rollout_constraint(node: Pairs) -> CompileResult { Ok(Box::new(move |context: &Context| { if let Some(stickiness) = stickiness_resolver(context) { - let group_id = match &group_id { Some(group_id) => group_id.clone(), None => context.toggle_name.clone(), diff --git a/unleash-yggdrasil/src/strategy_upgrade.rs b/unleash-yggdrasil/src/strategy_upgrade.rs index 1af280ab..22805978 100644 --- a/unleash-yggdrasil/src/strategy_upgrade.rs +++ b/unleash-yggdrasil/src/strategy_upgrade.rs @@ -968,6 +968,9 @@ mod tests { assert!(compile_rule(&rule).is_ok()); - assert_eq!(rule.as_str(), "user_id in [\"[\\\"123\\\"\",\"\\\"456\\\"\",\"\\\"789\\\"]\"]"); + assert_eq!( + rule.as_str(), + "user_id in [\"[\\\"123\\\"\",\"\\\"456\\\"\",\"\\\"789\\\"]\"]" + ); } } diff --git a/yggdrasilwasm/src/lib.rs b/yggdrasilwasm/src/lib.rs index 4fa0642a..8abf4338 100644 --- a/yggdrasilwasm/src/lib.rs +++ b/yggdrasilwasm/src/lib.rs @@ -2,10 +2,10 @@ use serde::{Deserialize, Serialize}; use serde_wasm_bindgen::from_value; -use wasm_bindgen::prelude::*; -use unleash_yggdrasil::{Context, EngineState, ExtendedVariantDef}; -use unleash_types::client_features::ClientFeatures; use std::collections::HashMap; +use unleash_types::client_features::ClientFeatures; +use unleash_yggdrasil::{Context, EngineState, ExtendedVariantDef}; +use wasm_bindgen::prelude::*; type CustomStrategyResults = HashMap; @@ -70,7 +70,12 @@ impl Engine { } #[wasm_bindgen(js_name = checkEnabled)] - pub fn check_enabled(&self, toggle_name: &str, context: JsValue, custom_strategy_results: JsValue) -> JsValue { + pub fn check_enabled( + &self, + toggle_name: &str, + context: JsValue, + custom_strategy_results: JsValue, + ) -> JsValue { let context: Context = match from_value(context) { Ok(ctx) => ctx, Err(e) => { @@ -83,23 +88,26 @@ impl Engine { } }; - let custom_strategy_results: Option = if custom_strategy_results.is_null() || custom_strategy_results.is_undefined() { - None - } else { - match from_value(custom_strategy_results) { - Ok(results) => Some(results), - Err(e) => { - let response = Response:: { - status_code: ResponseCode::Error, - value: None, - error_message: Some(format!("Invalid strategy results: {}", e)), - }; - return serde_wasm_bindgen::to_value(&response).unwrap(); + let custom_strategy_results: Option = + if custom_strategy_results.is_null() || custom_strategy_results.is_undefined() { + None + } else { + match from_value(custom_strategy_results) { + Ok(results) => Some(results), + Err(e) => { + let response = Response:: { + status_code: ResponseCode::Error, + value: None, + error_message: Some(format!("Invalid strategy results: {}", e)), + }; + return serde_wasm_bindgen::to_value(&response).unwrap(); + } } - } - }; + }; - let check_enabled = self.engine.check_enabled(toggle_name, &context, &custom_strategy_results); + let check_enabled = + self.engine + .check_enabled(toggle_name, &context, &custom_strategy_results); let response = Response { status_code: ResponseCode::Ok, @@ -111,7 +119,12 @@ impl Engine { } #[wasm_bindgen(js_name = checkVariant)] - pub fn check_variant(&self, toggle_name: &str, context: JsValue, custom_strategy_results: JsValue) -> JsValue { + pub fn check_variant( + &self, + toggle_name: &str, + context: JsValue, + custom_strategy_results: JsValue, + ) -> JsValue { let context: Context = match from_value(context) { Ok(ctx) => ctx, Err(e) => { @@ -124,26 +137,32 @@ impl Engine { } }; - let custom_strategy_results: Option = if custom_strategy_results.is_null() || custom_strategy_results.is_undefined() { - None - } else { - match from_value(custom_strategy_results) { - Ok(results) => Some(results), - Err(e) => { - let response = Response:: { - status_code: ResponseCode::Error, - value: None, - error_message: Some(format!("Invalid strategy results: {}", e)), - }; - return serde_wasm_bindgen::to_value(&response).unwrap(); + let custom_strategy_results: Option = + if custom_strategy_results.is_null() || custom_strategy_results.is_undefined() { + None + } else { + match from_value(custom_strategy_results) { + Ok(results) => Some(results), + Err(e) => { + let response = Response:: { + status_code: ResponseCode::Error, + value: None, + error_message: Some(format!("Invalid strategy results: {}", e)), + }; + return serde_wasm_bindgen::to_value(&response).unwrap(); + } } - } - }; + }; - let base_variant = self.engine.check_variant(toggle_name, &context, &custom_strategy_results); - let toggle_enabled = self.engine.is_enabled(toggle_name, &context, &custom_strategy_results); + let base_variant = + self.engine + .check_variant(toggle_name, &context, &custom_strategy_results); + let toggle_enabled = + self.engine + .is_enabled(toggle_name, &context, &custom_strategy_results); - let enriched_variant = base_variant.map(|variant| variant.to_enriched_response(toggle_enabled)); + let enriched_variant = + base_variant.map(|variant| variant.to_enriched_response(toggle_enabled)); let response = Response { status_code: ResponseCode::Ok,