fix(clippy): fix broken clippy's

sigaloid · sigaloid · commit 2db763ef1822 · 2025-09-09T14:16:27.000-04:00
diff --git a/src/settings.rs b/src/settings.rs
@@ -159,8 +159,8 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body
 		.unwrap_or_else(String::new); // Return an empty string if None
 
 	// If there are subscriptions to restore set them and delete any old subscriptions cookies, otherwise delete them all
-	if subscriptions.is_some() {
-		let sub_list: Vec<String> = subscriptions.expect("Subscriptions").split('+').map(str::to_string).collect();
+	if let Some(subscriptions) = subscriptions {
+		let sub_list: Vec<String> = subscriptions.split('+').map(str::to_string).collect();
 
 		// Start at 0 to keep track of what number we need to start deleting old subscription cookies from
 		let mut subscriptions_number_to_delete_from = 0;
@@ -210,8 +210,8 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body
 	}
 
 	// If there are filters to restore set them and delete any old filters cookies, otherwise delete them all
-	if filters.is_some() {
-		let filters_list: Vec<String> = filters.expect("Filters").split('+').map(str::to_string).collect();
+	if let Some(filters) = filters {
+		let filters_list: Vec<String> = filters.split('+').map(str::to_string).collect();
 
 		// Start at 0 to keep track of what number we need to start deleting old subscription cookies from
 		let mut filters_number_to_delete_from = 0;
diff --git a/src/utils.rs b/src/utils.rs
@@ -1423,13 +1423,13 @@ pub async fn nsfw_landing(req: Request<Body>, req_url: String) -> Result<Respons
 pub fn url_path_basename(path: &str) -> String {
 	let url_result = Url::parse(format!("https://libredd.it/{path}").as_str());
 
-	if url_result.is_err() {
-		path.to_string()
-	} else {
-		let mut url = url_result.unwrap();
-		url.path_segments_mut().unwrap().pop_if_empty();
+	match url_result {
+		Ok(mut url) => {
+			url.path_segments_mut().unwrap().pop_if_empty();
 
-		url.path_segments().unwrap().next_back().unwrap().to_string()
+			url.path_segments().unwrap().next_back().unwrap().to_string()
+		}
+		Err(_) => path.to_string(),
 	}
 }
 
