Skip to content

Commit 758e811

Browse files
cacttercpu
authored andcommitted
Shrink unsafe block
1 parent 9008488 commit 758e811

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/rslice.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ pub struct rustls_slice_slice_bytes<'a> {
7878
/// returns 0.
7979
#[no_mangle]
8080
pub extern "C" fn rustls_slice_slice_bytes_len(input: *const rustls_slice_slice_bytes) -> size_t {
81-
unsafe {
82-
match input.as_ref() {
81+
82+
match unsafe { input.as_ref() } {
8383
Some(c) => c.inner.len(),
8484
None => 0,
8585
}
86-
}
86+
8787
}
8888

8989
/// Retrieve the nth element from the input slice of slices. If the input
@@ -94,8 +94,8 @@ pub extern "C" fn rustls_slice_slice_bytes_get(
9494
input: *const rustls_slice_slice_bytes,
9595
n: size_t,
9696
) -> rustls_slice_bytes {
97-
let input: &rustls_slice_slice_bytes = unsafe {
98-
match input.as_ref() {
97+
let input: &rustls_slice_slice_bytes = {
98+
match unsafe { input.as_ref() } {
9999
Some(c) => c,
100100
None => {
101101
return rustls_slice_bytes {

src/session.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,24 @@ impl SessionStoreBroker {
9696
// See <https://github.com/rustls/rustls-ffi/pull/64#issuecomment-800766940>
9797
let mut data: Vec<u8> = vec![0; 65 * 1024];
9898
let mut out_n: size_t = 0;
99-
unsafe {
100-
let cb = self.get_cb;
101-
let result = cb(
99+
100+
let cb = self.get_cb;
101+
let result = unsafe {
102+
cb(
102103
userdata,
103104
&key,
104105
remove as c_int,
105106
data.as_mut_ptr(),
106107
data.len(),
107108
&mut out_n,
108-
);
109-
match rustls_result::from(result) {
110-
rustls_result::Ok => {
111-
data.set_len(out_n);
112-
Some(data)
113-
}
114-
_ => None,
109+
)
110+
};
111+
match rustls_result::from(result) {
112+
rustls_result::Ok => {
113+
unsafe { data.set_len(out_n) };
114+
Some(data)
115115
}
116+
_ => None,
116117
}
117118
}
118119

0 commit comments

Comments
 (0)