Shrink unsafe block

Author: cactter

src/rslice.rs

@@ -78,11 +78,9 @@ pub struct rustls_slice_slice_bytes<'a> {
 /// returns 0.
 #[no_mangle]
 pub extern "C" fn rustls_slice_slice_bytes_len(input: *const rustls_slice_slice_bytes) -> size_t {
-    unsafe {
-        match input.as_ref() {
-            Some(c) => c.inner.len(),
-            None => 0,
-        }
+    match unsafe { input.as_ref() } {
+        Some(c) => c.inner.len(),
+        None => 0,
     }
 }
 
@@ -94,8 +92,8 @@ pub extern "C" fn rustls_slice_slice_bytes_get(
     input: *const rustls_slice_slice_bytes,
     n: size_t,
 ) -> rustls_slice_bytes {
-    let input: &rustls_slice_slice_bytes = unsafe {
-        match input.as_ref() {
+    let input: &rustls_slice_slice_bytes = {
+        match unsafe { input.as_ref() } {
             Some(c) => c,
             None => {
                 return rustls_slice_bytes {

src/session.rs

@@ -96,23 +96,24 @@ impl SessionStoreBroker {
         // See <https://github.com/rustls/rustls-ffi/pull/64#issuecomment-800766940>
         let mut data: Vec<u8> = vec![0; 65 * 1024];
         let mut out_n: size_t = 0;
-        unsafe {
-            let cb = self.get_cb;
-            let result = cb(
+
+        let cb = self.get_cb;
+        let result = unsafe {
+            cb(
                 userdata,
                 &key,
                 remove as c_int,
                 data.as_mut_ptr(),
                 data.len(),
                 &mut out_n,
-            );
-            match rustls_result::from(result) {
-                rustls_result::Ok => {
-                    data.set_len(out_n);
-                    Some(data)
-                }
-                _ => None,
+            )
+        };
+        match rustls_result::from(result) {
+            rustls_result::Ok => {
+                unsafe { data.set_len(out_n) };
+                Some(data)
             }
+            _ => None,
         }
     }