summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fcntl.rs4
-rw-r--r--src/sys/socket/mod.rs2
-rw-r--r--src/sys/socket/sockopt.rs2
-rw-r--r--test/test_fcntl.rs2
4 files changed, 4 insertions, 6 deletions
diff --git a/src/fcntl.rs b/src/fcntl.rs
index 160b022d..65082834 100644
--- a/src/fcntl.rs
+++ b/src/fcntl.rs
@@ -809,9 +809,7 @@ pub fn fspacectl_all(fd: RawFd, offset: libc::off_t, len: libc::off_t)
0, // No flags are currently supported
&mut rqsr
)};
- if let Err(e) = Errno::result(res) {
- return Err(e);
- }
+ Errno::result(res)?;
}
Ok(())
}
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
index ecbf30ad..66774205 100644
--- a/src/sys/socket/mod.rs
+++ b/src/sys/socket/mod.rs
@@ -1459,7 +1459,7 @@ pub fn sendmsg<S>(fd: RawFd, iov: &[IoSlice<'_>], cmsgs: &[ControlMessage],
// because subsequent code will not clear the padding bytes.
let mut cmsg_buffer = vec![0u8; capacity];
- let mhdr = pack_mhdr_to_send(&mut cmsg_buffer[..], &iov, &cmsgs, addr);
+ let mhdr = pack_mhdr_to_send(&mut cmsg_buffer[..], iov, cmsgs, addr);
let ret = unsafe { libc::sendmsg(fd, &mhdr, flags.bits()) };
diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs
index 1cbb223e..b3828b31 100644
--- a/src/sys/socket/sockopt.rs
+++ b/src/sys/socket/sockopt.rs
@@ -816,7 +816,7 @@ struct SetBool {
impl<'a> Set<'a, bool> for SetBool {
fn new(val: &'a bool) -> SetBool {
- SetBool { val: if *val { 1 } else { 0 } }
+ SetBool { val: i32::from(*val) }
}
fn ffi_ptr(&self) -> *const c_void {
diff --git a/test/test_fcntl.rs b/test/test_fcntl.rs
index f4adee21..bc65b260 100644
--- a/test/test_fcntl.rs
+++ b/test/test_fcntl.rs
@@ -216,7 +216,7 @@ fn test_readlink() {
let src = tempdir.path().join("a");
let dst = tempdir.path().join("b");
println!("a: {:?}, b: {:?}", &src, &dst);
- fs::symlink(&src.as_path(), &dst.as_path()).unwrap();
+ fs::symlink(src.as_path(), dst.as_path()).unwrap();
let dirfd = open(tempdir.path(), OFlag::empty(), Mode::empty()).unwrap();
let expected_dir = src.to_str().unwrap();