Fix compilation hopefully, style improvements

Author: svix-jplatte

Diff for: server/svix-server/src/cfg.rs

@@ -76,34 +76,33 @@ fn default_redis_pending_duration_secs() -> u64 {
     45
 }
 
-fn validate_operational_webhook_url(url: &Option<String>) -> Result<(), ValidationError> {
-    if let Some(url_str) = url {
-        match Url::parse(url_str) {
-            Ok(url) => {
-                // Verify scheme is http or https
-                if url.scheme() != "http" && url.scheme() != "https" {
-                    return Err(validation_error(
-                        Some("operational_webhook_address"),
-                        Some("URL scheme must be http or https"),
-                    ));
-                }
-
-                // Verify there's a host
-                if url.host().is_none() {
-                    return Err(validation_error(
-                        Some("operational_webhook_address"),
-                        Some("URL must include a valid host"),
-                    ));
-                }
+fn validate_operational_webhook_url(url: &str) -> Result<(), ValidationError> {
+    match Url::parse(url) {
+        Ok(url) => {
+            // Verify scheme is http or https
+            if url.scheme() != "http" && url.scheme() != "https" {
+                return Err(validation_error(
+                    Some("operational_webhook_address"),
+                    Some("URL scheme must be http or https"),
+                ));
             }
-            Err(_) => {
+
+            // Verify there's a host
+            if url.host().is_none() {
                 return Err(validation_error(
                     Some("operational_webhook_address"),
-                    Some("Invalid URL format"),
+                    Some("URL must include a valid host"),
                 ));
             }
         }
+        Err(_) => {
+            return Err(validation_error(
+                Some("operational_webhook_address"),
+                Some("Invalid URL format"),
+            ));
+        }
     }
+
     Ok(())
 }
 

Diff for: server/svix-server/src/core/operational_webhooks.rs

@@ -115,16 +115,14 @@ pub struct OperationalWebhookSenderInner {
 }
 
 impl OperationalWebhookSenderInner {
-    pub fn new(keys: Arc<JwtSigningConfig>, url: Option<String>) -> Arc<Self> {
+    pub fn new(keys: Arc<JwtSigningConfig>, mut url: Option<String>) -> Arc<Self> {
         // Sanitize the URL if present
-        let sanitized_url = url.as_ref().map(|url_str| {
+        if let Some(url) = &mut url {
             // Remove trailing slashes
-            let mut cleaned_url = url_str.to_string();
             while cleaned_url.ends_with('/') {
                 cleaned_url.pop();
             }
-            cleaned_url
-        });
+        }
 
         Arc::new(Self {
             signing_config: keys,