diff options
Diffstat (limited to 'openvpn_ffi/src')
| -rw-r--r-- | openvpn_ffi/src/lib.rs | 2 | ||||
| -rw-r--r-- | openvpn_ffi/src/parse.rs | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/openvpn_ffi/src/lib.rs b/openvpn_ffi/src/lib.rs index 702ea43315..00e0d58031 100644 --- a/openvpn_ffi/src/lib.rs +++ b/openvpn_ffi/src/lib.rs @@ -59,7 +59,7 @@ impl OpenVpnPluginEvent { /// Tries to parse an integer from C into a variant of `OpenVpnPluginEvent`. pub fn from_int(i: c_int) -> Result<OpenVpnPluginEvent> { if i >= OpenVpnPluginEvent::Up as c_int && i <= OpenVpnPluginEvent::N as c_int { - Ok(unsafe { ::std::mem::transmute_copy::<c_int, OpenVpnPluginEvent>(&i) }) + Ok(unsafe { ::std::mem::transmute_copy::<c_int, OpenVpnPluginEvent>(&i) },) } else { bail!(ErrorKind::InvalidEnumVariant(i)); } diff --git a/openvpn_ffi/src/parse.rs b/openvpn_ffi/src/parse.rs index 2da10e3ca2..787883fd70 100644 --- a/openvpn_ffi/src/parse.rs +++ b/openvpn_ffi/src/parse.rs @@ -95,9 +95,11 @@ mod tests { fn string_array_two_strings() { let test_str1 = "foobar\0"; let test_str2 = "barbaz\0"; - let ptr_arr = [test_str1 as *const _ as *const c_char, - test_str2 as *const _ as *const c_char, - ptr::null()]; + let ptr_arr = [ + test_str1 as *const _ as *const c_char, + test_str2 as *const _ as *const c_char, + ptr::null(), + ]; let result = unsafe { string_array(&ptr_arr as *const *const c_char).unwrap() }; assert_eq!(["foobar", "barbaz"], &result[..]); } @@ -132,9 +134,11 @@ mod tests { fn env_two_same_key() { let test_str1 = "foo=123\0"; let test_str2 = "foo=abc\0"; - let ptr_arr = [test_str1 as *const _ as *const c_char, - test_str2 as *const _ as *const c_char, - ptr::null()]; + let ptr_arr = [ + test_str1 as *const _ as *const c_char, + test_str2 as *const _ as *const c_char, + ptr::null(), + ]; let env = unsafe { env(&ptr_arr as *const *const c_char).unwrap() }; assert_eq!(1, env.len()); assert_eq!(Some("abc"), env.get("foo").map(|s| &s[..])); |