Skip to content

Commit 67ab0ce

Browse files
committed
Shrink unsafe block
1 parent cedaa4b commit 67ab0ce

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/rslice.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ pub struct rustls_slice_slice_bytes<'a> {
6868
/// returns 0.
6969
#[no_mangle]
7070
pub extern "C" fn rustls_slice_slice_bytes_len(input: *const rustls_slice_slice_bytes) -> size_t {
71-
unsafe {
72-
match input.as_ref() {
71+
72+
match unsafe { input.as_ref() } {
7373
Some(c) => c.inner.len(),
7474
None => 0,
7575
}
76-
}
76+
7777
}
7878

7979
/// Retrieve the nth element from the input slice of slices. If the input
@@ -84,8 +84,8 @@ pub extern "C" fn rustls_slice_slice_bytes_get(
8484
input: *const rustls_slice_slice_bytes,
8585
n: size_t,
8686
) -> rustls_slice_bytes {
87-
let input: &rustls_slice_slice_bytes = unsafe {
88-
match input.as_ref() {
87+
let input: &rustls_slice_slice_bytes = {
88+
match unsafe { input.as_ref() } {
8989
Some(c) => c,
9090
None => {
9191
return rustls_slice_bytes {

src/session.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,26 +98,26 @@ impl SessionStoreBroker {
9898
// See <https://github.com/rustls/rustls-ffi/pull/64#issuecomment-800766940>
9999
let mut data: Vec<u8> = vec![0; 65 * 1024];
100100
let mut out_n: size_t = 0;
101-
unsafe {
101+
102102
let cb = self.get_cb;
103-
let result = cb(
103+
let result = unsafe { cb(
104104
userdata,
105105
&key,
106106
remove as c_int,
107107
data.as_mut_ptr(),
108108
data.len(),
109109
&mut out_n,
110-
);
110+
) };
111111
let result: rustls_result =
112112
rustls_result::try_from(result).unwrap_or(rustls_result::General);
113113
match result {
114114
rustls_result::Ok => {
115-
data.set_len(out_n);
115+
unsafe { data.set_len(out_n) };
116116
Some(data)
117117
}
118118
_ => None,
119119
}
120-
}
120+
121121
}
122122

123123
fn store(&self, key: Vec<u8>, value: Vec<u8>) -> bool {

0 commit comments

Comments
 (0)