diff --git a/src/io/mod.rs b/src/io/mod.rs index cc26853..47aebbc 100644 --- a/src/io/mod.rs +++ b/src/io/mod.rs @@ -480,7 +480,7 @@ op_future! { iovecs: [libc::iovec; N], }, /// `iovecs` can't move until the kernel has read the submission. - impl !Upin, + impl !Unpin, setup_state: offset: u64, setup: |submission, fd, (_bufs, iovecs), offset| unsafe { submission.read_vectored_at(fd.fd(), iovecs, offset); @@ -724,7 +724,7 @@ op_future! { iovecs: [libc::iovec; N], }, /// `iovecs` can't move until the kernel has read the submission. - impl !Upin, + impl !Unpin, setup_state: offset: u64, setup: |submission, fd, (_bufs, iovecs), offset| unsafe { submission.write_vectored_at(fd.fd(), iovecs, offset); diff --git a/src/lib.rs b/src/lib.rs index 9aa236e..48850e0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -518,7 +518,7 @@ impl SubmissionQueue { self._add(submit, QueuedOperation::new) } - /// Same as [`add`] but uses a multishot `QueuedOperation`. + /// Same as [`SubmissionQueue::add`] but uses a multishot `QueuedOperation`. fn add_multishot(&self, submit: F) -> Result where F: FnOnce(&mut Submission), @@ -526,7 +526,7 @@ impl SubmissionQueue { self._add(submit, QueuedOperation::new_multishot) } - /// See [`add`] or [`add_multishot`]. + /// See [`SubmissionQueue::add`] or [`SubmissionQueue::add_multishot`]. fn _add(&self, submit: F, new_op: O) -> Result where F: FnOnce(&mut Submission), @@ -567,7 +567,7 @@ impl SubmissionQueue { self._queue(QueuedOperation::new_multishot) } - /// See [`queue_multishot`]. + /// See [`SubmissionQueue::queue_multishot`]. fn _queue(&self, new_op: O) -> Result where O: FnOnce() -> QueuedOperation, diff --git a/src/net.rs b/src/net.rs index f63df63..d2abd52 100644 --- a/src/net.rs +++ b/src/net.rs @@ -616,7 +616,7 @@ op_future! { iovecs: [libc::iovec; N], }, /// `msg` and `iovecs` can't move until the kernel has read the submission. - impl !Upin, + impl !Unpin, setup_state: flags: (u8, libc::c_int), setup: |submission, fd, (_, address, msg, iovecs), (op, flags)| unsafe { msg.msg_iov = iovecs.as_mut_ptr(); @@ -850,7 +850,7 @@ op_future! { iovecs: [libc::iovec; N], }, /// `iovecs` can't move until the kernel has read the submission. - impl !Upin, + impl !Unpin, setup_state: flags: libc::c_int, setup: |submission, fd, (_, msg, iovecs), flags| unsafe { msg.msg_iov = iovecs.as_mut_ptr(); @@ -944,7 +944,7 @@ op_future! { iovec: libc::iovec, }, /// `iovec` can't move until the kernel has read the submission. - impl !Upin, + impl !Unpin, setup_state: flags: libc::c_int, setup: |submission, fd, (buf, msg, iovec), flags| unsafe { let address = &mut msg.1; @@ -991,7 +991,7 @@ op_future! { iovecs: [libc::iovec; N], }, /// `iovecs` can't move until the kernel has read the submission. - impl !Upin, + impl !Unpin, setup_state: flags: libc::c_int, setup: |submission, fd, (_, msg, iovecs), flags| unsafe { let address = &mut msg.1; diff --git a/src/op.rs b/src/op.rs index 5a1df9a..1e0b839 100644 --- a/src/op.rs +++ b/src/op.rs @@ -1042,7 +1042,7 @@ macro_rules! op_future { // `PhantomPinned`. $( $(#[ $phantom_doc: meta ])* - impl !Upin, + impl !Unpin, )? // State held in the setup function. setup_state: $setup_field: ident : $setup_ty: ty, @@ -1065,7 +1065,7 @@ macro_rules! op_future { }, $( $(#[ $phantom_doc ])* - impl !Upin, + impl !Unpin, )? setup_state: $setup_field : $setup_ty, setup: |$setup_submission, $setup_fd, $setup_resources, $setup_state| $setup_fn, @@ -1113,7 +1113,7 @@ macro_rules! op_future { }, $( $(#[ $phantom_doc: meta ])* - impl !Upin, + impl !Unpin, )? setup_state: $setup_field: ident : $setup_ty: ty, setup: |$setup_submission: ident, $setup_fd: ident, $setup_resources: tt, $setup_state: tt| $setup_fn: expr, @@ -1247,7 +1247,7 @@ macro_rules! op_future { }, $( $(#[ $phantom_doc: meta ])* - impl !Upin, + impl !Unpin, )? setup_state: $setup_data: ident : $setup_ty: ty, setup: |$setup_submission: ident, $setup_fd: ident, $setup_resources: tt, $setup_state: tt| $setup_fn: expr, @@ -1264,7 +1264,7 @@ macro_rules! op_future { }, $( $(#[ $phantom_doc ])* - impl !Upin, + impl !Unpin, )? setup_state: $setup_data: $setup_ty, setup: |$setup_submission, $setup_fd, $setup_resources, $setup_state| $setup_fn, @@ -1283,7 +1283,7 @@ macro_rules! op_future { }, $( $(#[ $phantom_doc: meta ])* - impl !Upin, + impl !Unpin, )? setup_state: $setup_field: ident : $setup_ty: ty, setup: |$setup_submission: ident, $setup_fd: ident, $setup_resources: tt, $setup_state: tt| $setup_fn: expr, @@ -1300,7 +1300,7 @@ macro_rules! op_future { }, $( $(#[ $phantom_doc ])* - impl !Upin, + impl !Unpin, )? setup_state: $setup_field : $setup_ty, setup: |$setup_submission, $setup_fd, $setup_resources, $setup_state| $setup_fn,