Skip to content

Commit 3c69a8d

Browse files
authored
Clean up redundant Pid check (#694)
`Pid::from_raw_unchecked` already contains a positivity `debug_assert`.
1 parent c39e32b commit 3c69a8d

File tree

5 files changed

+0
-7
lines changed

5 files changed

+0
-7
lines changed

src/backend/linux_raw/pid/syscalls.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use crate::pid::{Pid, RawPid};
1313
pub(crate) fn getpid() -> Pid {
1414
unsafe {
1515
let pid = ret_usize_infallible(syscall_readonly!(__NR_getpid)) as RawPid;
16-
debug_assert!(pid > 0);
1716
Pid::from_raw_unchecked(pid)
1817
}
1918
}

src/backend/linux_raw/process/syscalls.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ unsafe fn cvt_waitid_status(status: MaybeUninit<c::siginfo_t>) -> Option<WaitidS
545545
pub(crate) fn getsid(pid: Option<Pid>) -> io::Result<Pid> {
546546
unsafe {
547547
let pid = ret_c_int(syscall_readonly!(__NR_getsid, c_int(Pid::as_raw(pid))))?;
548-
debug_assert!(pid > 0);
549548
Ok(Pid::from_raw_unchecked(pid))
550549
}
551550
}
@@ -554,7 +553,6 @@ pub(crate) fn getsid(pid: Option<Pid>) -> io::Result<Pid> {
554553
pub(crate) fn setsid() -> io::Result<Pid> {
555554
unsafe {
556555
let pid = ret_c_int(syscall_readonly!(__NR_setsid))?;
557-
debug_assert!(pid > 0);
558556
Ok(Pid::from_raw_unchecked(pid))
559557
}
560558
}

src/backend/linux_raw/runtime/syscalls.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ pub(crate) mod tls {
100100
#[inline]
101101
pub(crate) unsafe fn set_tid_address(data: *mut c::c_void) -> Pid {
102102
let tid: i32 = ret_c_int_infallible(syscall_readonly!(__NR_set_tid_address, data));
103-
debug_assert_ne!(tid, 0);
104103
Pid::from_raw_unchecked(tid)
105104
}
106105

src/backend/linux_raw/termios/syscalls.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ pub(crate) fn tcgetpgrp(fd: BorrowedFd<'_>) -> io::Result<Pid> {
7474
let mut result = MaybeUninit::<c::pid_t>::uninit();
7575
ret(syscall!(__NR_ioctl, fd, c_uint(TIOCGPGRP), &mut result))?;
7676
let pid = result.assume_init();
77-
debug_assert!(pid > 0);
7877
Ok(Pid::from_raw_unchecked(pid))
7978
}
8079
}
@@ -168,7 +167,6 @@ pub(crate) fn tcgetsid(fd: BorrowedFd) -> io::Result<Pid> {
168167
let mut result = MaybeUninit::<c::pid_t>::uninit();
169168
ret(syscall!(__NR_ioctl, fd, c_uint(TIOCGSID), &mut result))?;
170169
let pid = result.assume_init();
171-
debug_assert!(pid > 0);
172170
Ok(Pid::from_raw_unchecked(pid))
173171
}
174172
}

src/backend/linux_raw/thread/syscalls.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ unsafe fn nanosleep_old(
200200
pub(crate) fn gettid() -> Pid {
201201
unsafe {
202202
let tid = ret_c_int_infallible(syscall_readonly!(__NR_gettid));
203-
debug_assert_ne!(tid, 0);
204203
Pid::from_raw_unchecked(tid)
205204
}
206205
}

0 commit comments

Comments
 (0)