Skip to content

Commit ddf53b0

Browse files
authored
Comment out io_uring_enter_reg_wait for now. (#1376)
Also, fix several typos in comments.
1 parent a92c89f commit ddf53b0

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

src/backend/libc/net/addr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ impl SocketAddrUnix {
161161
owned.extend_from_slice(bytes);
162162
owned.push(b'\0');
163163
// SAFETY: `from_vec_with_nul_unchecked` since the string is
164-
// NUL-terminated and `bytes` does not conain any NULs.
164+
// NUL-terminated and `bytes` does not contain any NULs.
165165
Some(Cow::Owned(
166166
CString::from_vec_with_nul_unchecked(owned).into(),
167167
))

src/backend/linux_raw/net/addr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl SocketAddrUnix {
123123
owned.extend_from_slice(bytes);
124124
owned.push(b'\0');
125125
// SAFETY: `from_vec_with_nul_unchecked` since the string is
126-
// NUL-terminated and `bytes` does not conain any NULs.
126+
// NUL-terminated and `bytes` does not contain any NULs.
127127
Some(Cow::Owned(
128128
CString::from_vec_with_nul_unchecked(owned).into(),
129129
))

src/event/select.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ pub fn fd_set_num_elements(set_count: usize, nfds: RawFd) -> usize {
232232
#[cfg(any(windows, target_os = "wasi"))]
233233
#[inline]
234234
pub(crate) fn fd_set_num_elements_for_fd_array(set_count: usize) -> usize {
235-
// Ensure that we always have a big enough set to derefence an `FD_SET`.
235+
// Ensure that we always have a big enough set to dereference an `FD_SET`.
236236
core::cmp::max(
237237
fd_set_num_elements_for_fd_array_raw(set_count),
238238
div_ceil(size_of::<FD_SET>(), size_of::<FdSetElement>()),

src/io_uring/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,11 @@ pub unsafe fn io_uring_enter_arg<Fd: AsFd>(
271271
)
272272
}
273273

274+
// TODO: Uncomment this when we support `IoringRegisterOp::CQWAIT_REG`.
275+
/*
274276
/// `io_uring_enter2(fd, to_submit, min_complete, flags, offset,
275277
/// sizeof(io_uring_reg_wait))`— Initiate and/or complete asynchronous I/O,
276-
/// using a previously regisered `io_uring_reg_wait`.
278+
/// using a previously registered `io_uring_reg_wait`.
277279
///
278280
/// `offset` is an offset into an area of wait regions previously registered
279281
/// with [`io_uring_register`] using the [`IoringRegisterOp::CQWAIT_REG`]
@@ -314,6 +316,7 @@ pub unsafe fn io_uring_enter_reg_wait<Fd: AsFd>(
314316
size_of::<io_uring_reg_wait>(),
315317
)
316318
}
319+
*/
317320

318321
bitflags::bitflags! {
319322
/// `IORING_ENTER_*` flags for use with [`io_uring_enter`].

src/kernel_sigset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use linux_raw_sys::general::{kernel_sigset_t, _NSIG};
1111
/// `kernel_sigset_t`—A set of signal numbers, as used by some syscalls.
1212
///
1313
/// This is similar to `libc::sigset_t`, but with only enough space for the
14-
/// signals currently known to be used by the kernel. libc implementaions
14+
/// signals currently known to be used by the kernel. libc implementations
1515
/// reserve extra space so that if Linux defines new signals in the future
1616
/// they can add support without breaking their dynamic linking ABI. Rustix
1717
/// doesn't support a dynamic linking ABI, so if we need to increase the

src/runtime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ pub unsafe fn kernel_sigaction(
536536
/// While the memory region pointed to by `new` is registered as a signal
537537
/// stack, it must remain readable and writable, and must not be mutated in
538538
/// any way other than by having a signal handler run in it, and must not be
539-
/// the referant of a Rust reference from outside the signal handler.
539+
/// the referent of a Rust reference from outside the signal handler.
540540
///
541541
/// If code elsewhere in the program is depending on signal handlers being run
542542
/// on a particular stack, this could break that code's assumptions. And if the

0 commit comments

Comments
 (0)