chore: apply some lints and fixes (#130)

Unleash · Jun 26, 2024 · c1b1012 · c1b1012
1 parent 1fe170d
commit c1b1012
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/unleash-yggdrasil/src/lib.rs b/unleash-yggdrasil/src/lib.rs
@@ -466,8 +466,7 @@ impl EngineState {
         }
         let total_weight: u32 = variants.iter().map(|var| var.weight as u32).sum();
 
-        let stickiness = variants
-            .get(0)
+        let stickiness = variants.first()
             .and_then(|variant| variant.stickiness.clone());
 
         let target = get_seed(stickiness, context)

diff --git a/unleash-yggdrasil/src/strategy_parsing.rs b/unleash-yggdrasil/src/strategy_parsing.rs
@@ -1140,7 +1140,7 @@ mod tests {
         expected_value: bool,
     ) {
         let constraint_ips = constraint_ips
-            .split(",")
+            .split(',')
             .map(|x| format!("\"{}\"", x.trim()))
             .collect::<Vec<String>>();
 

diff --git a/unleash-yggdrasil/src/strategy_upgrade.rs b/unleash-yggdrasil/src/strategy_upgrade.rs
@@ -15,6 +15,9 @@ enum StrategyType {
     FlexibleRollout,
     RemoteAddress,
     ApplicationHostname,
+    //This is a catch all handler on the enum type because we don't know what the
+    // custom strategy will be called ahead of time
+    #[allow(dead_code)]
     Custom(String),
 }
 
@@ -31,7 +34,7 @@ impl IsCustom for Strategy {
     }
 }
 
-pub fn upgrade(strategies: &Vec<Strategy>, segment_map: &HashMap<i32, Segment>) -> String {
+pub fn upgrade(strategies: &[Strategy], segment_map: &HashMap<i32, Segment>) -> String {
     if strategies.is_empty() {
         return "true".into();
     }

diff --git a/yggdrasilffi/src/lib.rs b/yggdrasilffi/src/lib.rs
@@ -51,7 +51,7 @@ impl<T> From<Result<Option<T>, FFIError>> for Response<T> {
 enum FFIError {
     Utf8Error,
     InvalidJson,
-    NullError(String),
+    NullError,
 }
 
 const KNOWN_STRATEGIES: [&str; 8] = [
@@ -79,15 +79,15 @@ impl From<serde_json::Error> for FFIError {
 
 unsafe fn get_engine<'a>(engine_ptr: *mut c_void) -> Result<&'a mut EngineState, FFIError> {
     if engine_ptr.is_null() {
-        Err(FFIError::NullError("Null engine pointer".into()))
+        Err(FFIError::NullError)
     } else {
         Ok(unsafe { &mut *(engine_ptr as *mut EngineState) })
     }
 }
 
 unsafe fn get_str<'a>(ptr: *const c_char) -> Result<&'a str, FFIError> {
     if ptr.is_null() {
-        Err(FFIError::NullError("Null pointer".into()))
+        Err(FFIError::NullError)
     } else {
         unsafe { CStr::from_ptr(ptr).to_str().map_err(FFIError::from) }
     }