chore: Fix several style lints (#17488)

It's not comprehensive enough to start linting on `style` group, but
hey, it's a start.

Release Notes:

- N/A

crates/client/src/socks.rs

@@ -35,12 +35,8 @@ pub(crate) async fn connect_socks_proxy_stream(
 }
 
 fn parse_socks_proxy(proxy: Option<&Uri>) -> Option<((String, u16), SocksVersion)> {
-    let Some(proxy_uri) = proxy else {
-        return None;
-    };
-    let Some(scheme) = proxy_uri.scheme_str() else {
-        return None;
-    };
+    let proxy_uri = proxy?;
+    let scheme = proxy_uri.scheme_str()?;
     let socks_version = if scheme.starts_with("socks4") {
         // socks4
         SocksVersion::V4