Skip to content

Commit 3b8ffeb

Browse files
authored
Avoid using .expect in release mode. (#1125)
This reduces code size.
1 parent adf24e7 commit 3b8ffeb

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/net/send_recv/msg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ mod messages {
942942
let msghdr = {
943943
let mut h = msghdr::zero_msghdr();
944944
h.msg_control = buf.as_mut_ptr().cast();
945-
h.msg_controllen = buf.len().try_into().expect("buffer too large for msghdr");
945+
h.msg_controllen = buf.len().try_into().unwrap();
946946
h
947947
};
948948

src/thread/futex.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use core::ptr;
1111
use core::sync::atomic::AtomicU32;
1212

1313
use crate::backend::thread::syscalls::{futex_timeout, futex_val2};
14-
use crate::fd::{FromRawFd, OwnedFd};
14+
use crate::fd::{FromRawFd, OwnedFd, RawFd};
1515
use crate::thread::Timespec;
1616
use crate::{backend, io};
1717

@@ -172,7 +172,11 @@ pub fn fd(uaddr: &AtomicU32, flags: FutexFlags, val: u32) -> io::Result<OwnedFd>
172172
ptr::null(),
173173
0,
174174
)
175-
.map(|fd| OwnedFd::from_raw_fd(fd.try_into().expect("return value should be a valid fd")))
175+
.map(|val| {
176+
let fd = val as RawFd;
177+
debug_assert_eq!(fd as usize, val, "return value should be a valid fd");
178+
OwnedFd::from_raw_fd(fd)
179+
})
176180
}
177181
}
178182

0 commit comments

Comments
 (0)