Rename ReplyTail as ReplyState

10 files changed, 51 insertions, 51 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 4830308..18dc5e5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,7 +27,7 @@ mod util;
 
 pub trait Operation<'o>: private_trait::Sealed + Sized {
     type RequestBody: crate::proto::Structured<'o>;
-    type ReplyTail;
+    type ReplyState;
 }
 
 pub type Op<'o, O = ops::Any> = (Request<'o, O>, Reply<'o, O>);
@@ -41,7 +41,7 @@ pub struct Request<'o, O: Operation<'o>> {
 pub struct Reply<'o, O: Operation<'o>> {
     session: &'o session::Session,
     unique: u64,
-    tail: O::ReplyTail,
+    state: O::ReplyState,
 }
 
 /// Inode number.
diff --git a/src/mod.rs b/src/mod.rs
index 84c6878..8f0be0e 100644
--- a/src/mod.rs
+++ b/src/mod.rs
@@ -12,7 +12,7 @@ mod private_trait {
 
 pub trait Operation<'o>: private_trait::Sealed + Sized {
     type RequestBody: crate::proto::Structured<'o>;
-    type ReplyTail;
+    type ReplyState;
 }
 
 pub type Op<'o, O = ops::Any> = (Request<'o, O>, Reply<'o, O>);
@@ -26,7 +26,7 @@ pub struct Request<'o, O: Operation<'o>> {
 pub struct Reply<'o, O: Operation<'o>> {
     session: &'o session::Session,
     unique: u64,
-    tail: O::ReplyTail,
+    state: O::ReplyState,
 }
 
 #[must_use]
diff --git a/src/ops/dir.rs b/src/ops/dir.rs
index 5bb64d2..5e2758a 100644
--- a/src/ops/dir.rs
+++ b/src/ops/dir.rs
@@ -50,7 +50,7 @@ impl<B> Sealed for BufferedReaddir<B> {}
 
 impl<'o> Operation<'o> for Lookup {
     type RequestBody = &'o CStr; // name()
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Readdir {
@@ -60,12 +60,12 @@ impl<'o> Operation<'o> for Readdir {
         { proto::Opcode::ReaddirPlus as u32 },
     >;
 
-    type ReplyTail = ReaddirState<()>;
+    type ReplyState = ReaddirState<()>;
 }
 
 impl<'o, B> Operation<'o> for BufferedReaddir<B> {
     type RequestBody = (); // Never actually created
-    type ReplyTail = ReaddirState<B>;
+    type ReplyState = ReaddirState<B>;
 }
 
 impl<'o> RequestName<'o> for Lookup {
@@ -122,12 +122,12 @@ where
             max_read,
             is_plus,
             buffer: (),
-        } = reply.tail;
+        } = reply.state;
 
         Reply {
             session: reply.session,
             unique: reply.unique,
-            tail: ReaddirState {
+            state: ReaddirState {
                 max_read,
                 is_plus,
                 buffer,
@@ -138,7 +138,7 @@ where
 
 impl<'o, B: BufMut + AsRef<[u8]>> ReplyEntries<'o> for BufferedReaddir<B> {
     fn entry(mut reply: Reply<'o, Self>, entry: Entry<impl Known>) -> Interruptible<'o, Self, ()> {
-        let entry_header_len = if reply.tail.is_plus {
+        let entry_header_len = if reply.state.is_plus {
             std::mem::size_of::<proto::DirentPlus>()
         } else {
             std::mem::size_of::<proto::Dirent>()
@@ -147,10 +147,10 @@ impl<'o, B: BufMut + AsRef<[u8]>> ReplyEntries<'o> for BufferedReaddir<B> {
         let name = entry.name.as_bytes();
         let padding_len = dirent_pad_bytes(entry_header_len + name.len());
 
-        let buffer = &mut reply.tail.buffer;
+        let buffer = &mut reply.state.buffer;
         let remaining = buffer
             .remaining_mut()
-            .min(reply.tail.max_read - buffer.as_ref().len());
+            .min(reply.state.max_read - buffer.as_ref().len());
 
         let record_len = entry_header_len + name.len() + padding_len;
         if remaining < record_len {
@@ -186,7 +186,7 @@ impl<'o, B: BufMut + AsRef<[u8]>> ReplyEntries<'o> for BufferedReaddir<B> {
             DirentPlus(proto::DirentPlus),
         }
 
-        let ent = if reply.tail.is_plus {
+        let ent = if reply.state.is_plus {
             let (attrs, attrs_ttl) = inode.attrs();
             let attrs = attrs.finish(inode);
             let entry_out = make_entry((ino, entry.ttl), (attrs, attrs_ttl));
@@ -217,7 +217,7 @@ impl<'o, B: BufMut + AsRef<[u8]>> ReplyEntries<'o> for BufferedReaddir<B> {
     }
 
     fn end(reply: Reply<'o, Self>) -> Done<'o> {
-        reply.inner(|reply| reply.tail.buffer.as_ref())
+        reply.inner(|reply| reply.state.buffer.as_ref())
     }
 }
 
diff --git a/src/ops/entry.rs b/src/ops/entry.rs
index 2998281..4f0b76f 100644
--- a/src/ops/entry.rs
+++ b/src/ops/entry.rs
@@ -43,27 +43,27 @@ impl<'o> Operation<'o> for Forget {
         { proto::Opcode::BatchForget as u32 },
     >;
 
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Getattr {
     type RequestBody = &'o proto::GetattrIn;
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Mkdir {
     type RequestBody = (&'o proto::MkdirIn, &'o CStr);
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Unlink {
     type RequestBody = &'o CStr; // name()
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Rmdir {
     type RequestBody = &'o CStr; // name()
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> RequestForget<'o> for Forget {
diff --git a/src/ops/global.rs b/src/ops/global.rs
index aa83b1e..65954f0 100644
--- a/src/ops/global.rs
+++ b/src/ops/global.rs
@@ -18,12 +18,12 @@ impl Sealed for Statfs {}
 
 impl<'o> Operation<'o> for Init {
     type RequestBody = &'o proto::InitIn;
-    type ReplyTail = InitState;
+    type ReplyState = InitState;
 }
 
 impl<'o> Operation<'o> for Statfs {
     type RequestBody = ();
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> ReplyOk<'o> for Init {
@@ -31,7 +31,7 @@ impl<'o> ReplyOk<'o> for Init {
         let InitState {
             kernel_flags,
             buffer_pages,
-        } = reply.tail;
+        } = reply.state;
 
         let flags = {
             use proto::InitFlags;
diff --git a/src/ops/mod.rs b/src/ops/mod.rs
index c33afb4..49ceaa9 100644
--- a/src/ops/mod.rs
+++ b/src/ops/mod.rs
@@ -38,7 +38,7 @@ impl Sealed for Any {}
 
 impl<'o> Operation<'o> for Any {
     type RequestBody = ();
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o, O: Operation<'o>> FromRequest<'o, O> for () {
diff --git a/src/ops/open.rs b/src/ops/open.rs
index 30dc6da..cb4b30a 100644
--- a/src/ops/open.rs
+++ b/src/ops/open.rs
@@ -15,9 +15,9 @@ pub enum Opendir {}
 pub enum Releasedir {}
 pub enum Access {}
 
-pub trait ReplyOpen<'o>: ReplyOk<'o, ReplyTail = proto::OpenOutFlags> {
+pub trait ReplyOpen<'o>: ReplyOk<'o, ReplyState = proto::OpenOutFlags> {
     fn ok_with_handle(reply: Reply<'o, Self>, handle: u64) -> Done<'o> {
-        let open_flags = reply.tail.bits();
+        let open_flags = reply.state.bits();
 
         reply.single(&proto::OpenOut {
             fh: handle,
@@ -27,7 +27,7 @@ pub trait ReplyOpen<'o>: ReplyOk<'o, ReplyTail = proto::OpenOutFlags> {
     }
 
     fn force_direct_io(reply: &mut Reply<'o, Self>) {
-        reply.tail |= proto::OpenOutFlags::DIRECT_IO;
+        reply.state |= proto::OpenOutFlags::DIRECT_IO;
     }
 }
 
@@ -45,27 +45,27 @@ impl Sealed for Access {}
 
 impl<'o> Operation<'o> for Open {
     type RequestBody = &'o proto::OpenIn;
-    type ReplyTail = proto::OpenOutFlags;
+    type ReplyState = proto::OpenOutFlags;
 }
 
 impl<'o> Operation<'o> for Release {
     type RequestBody = &'o proto::ReleaseIn;
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Opendir {
     type RequestBody = &'o proto::OpendirIn;
-    type ReplyTail = proto::OpenOutFlags;
+    type ReplyState = proto::OpenOutFlags;
 }
 
 impl<'o> Operation<'o> for Releasedir {
     type RequestBody = &'o proto::ReleasedirIn;
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Access {
     type RequestBody = &'o proto::AccessIn;
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> RequestFlags<'o> for Open {
diff --git a/src/ops/rw.rs b/src/ops/rw.rs
index d3f8afd..cf2e286 100644
--- a/src/ops/rw.rs
+++ b/src/ops/rw.rs
@@ -25,22 +25,22 @@ impl Sealed for Flush {}
 
 impl<'o> Operation<'o> for Readlink {
     type RequestBody = ();
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Read {
     type RequestBody = &'o proto::ReadIn;
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Write {
     type RequestBody = (&'o proto::WriteIn, &'o [u8]);
-    type ReplyTail = WriteState;
+    type ReplyState = WriteState;
 }
 
 impl<'o> Operation<'o> for Flush {
     type RequestBody = &'o proto::FlushIn;
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> ReplyGather<'o> for Readlink {}
@@ -85,7 +85,7 @@ impl<'o> RequestData<'o> for Write {
 
 impl<'o> ReplyAll<'o> for Write {
     fn all(reply: Reply<'o, Self>) -> Done<'o> {
-        let size = reply.tail.size;
+        let size = reply.state.size;
         reply.single(&proto::WriteOut {
             size,
             padding: Default::default(),
diff --git a/src/ops/xattr.rs b/src/ops/xattr.rs
index 33c7cef..ee26cff 100644
--- a/src/ops/xattr.rs
+++ b/src/ops/xattr.rs
@@ -34,22 +34,22 @@ impl Sealed for Removexattr {}
 impl<'o> Operation<'o> for Setxattr {
     // header, name, value
     type RequestBody = (&'o proto::SetxattrIn, &'o CStr, &'o [u8]);
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> Operation<'o> for Getxattr {
     type RequestBody = (&'o proto::GetxattrIn, &'o CStr);
-    type ReplyTail = XattrReadState;
+    type ReplyState = XattrReadState;
 }
 
 impl<'o> Operation<'o> for Listxattr {
     type RequestBody = &'o proto::ListxattrIn;
-    type ReplyTail = XattrReadState;
+    type ReplyState = XattrReadState;
 }
 
 impl<'o> Operation<'o> for Removexattr {
     type RequestBody = &'o CStr;
-    type ReplyTail = ();
+    type ReplyState = ();
 }
 
 impl<'o> RequestName<'o> for Setxattr {
@@ -102,9 +102,9 @@ impl<'o> ReplyGather<'o> for Getxattr {
             .try_into()
             .expect("Extremely large xattr");
 
-        if reply.tail.size == 0 {
+        if reply.state.size == 0 {
             return reply.requires_size(size);
-        } else if reply.tail.size < size {
+        } else if reply.state.size < size {
             return reply.buffer_too_small();
         }
 
@@ -114,7 +114,7 @@ impl<'o> ReplyGather<'o> for Getxattr {
 
 impl<'o> ReplyXattrRead<'o> for Getxattr {
     fn requires_size(reply: Reply<'o, Self>, size: u32) -> Done<'o> {
-        assert_eq!(reply.tail.size, 0);
+        assert_eq!(reply.state.size, 0);
 
         reply.single(&proto::GetxattrOut {
             size,
@@ -133,7 +133,7 @@ impl<'o> ReplyXattrRead<'o> for Listxattr {
     //TODO: buffered(), gather()
 
     fn requires_size(reply: Reply<'o, Self>, size: u32) -> Done<'o> {
-        assert_eq!(reply.tail.size, 0);
+        assert_eq!(reply.state.size, 0);
 
         reply.single(&proto::ListxattrOut {
             getxattr_out: proto::GetxattrOut {
diff --git a/src/session.rs b/src/session.rs
index 54a5e8c..7001e71 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -184,7 +184,7 @@ impl Session {
         let reply = Reply {
             session: self,
             unique: header.unique,
-            tail: ops::InitState {
+            state: ops::InitState {
                 kernel_flags: proto::InitFlags::from_bits_truncate(body.flags),
                 buffer_pages: self.buffer_pages,
             },
@@ -431,7 +431,7 @@ impl Start {
 
 impl<'o, O: Operation<'o>> Incoming<'o, O>
 where
-    O::ReplyTail: FromRequest<'o, O>,
+    O::ReplyState: FromRequest<'o, O>,
 {
     pub fn op(self) -> Result<Op<'o, O>, Done<'o>> {
         try_op(
@@ -472,7 +472,7 @@ where
 
 impl<O: for<'o> Operation<'o>> Owned<O>
 where
-    for<'o> <O as Operation<'o>>::ReplyTail: FromRequest<'o, O>,
+    for<'o> <O as Operation<'o>>::ReplyState: FromRequest<'o, O>,
 {
     pub async fn op<'o, F, Fut>(&'o self, handler: F)
     where
@@ -522,7 +522,7 @@ impl<'o> IncomingCommon<'o> {
         let reply = Reply {
             session: self.session,
             unique: self.header.unique,
-            tail: (),
+            state: (),
         };
 
         (request, reply)
@@ -541,7 +541,7 @@ fn try_op<'o, O: Operation<'o>>(
     header: InHeader,
 ) -> Result<Op<'o, O>, Done<'o>>
 where
-    O::ReplyTail: FromRequest<'o, O>,
+    O::ReplyState: FromRequest<'o, O>,
 {
     let body = match Structured::toplevel_from(&bytes[HEADER_END..header.len as usize], &header) {
         Ok(body) => body,
@@ -550,7 +550,7 @@ where
             let reply = Reply::<ops::Any> {
                 session,
                 unique: header.unique,
-                tail: (),
+                state: (),
             };
 
             return Err(reply.io_error());
@@ -561,7 +561,7 @@ where
     let reply = Reply {
         session,
         unique: header.unique,
-        tail: FromRequest::from_request(&request),
+        state: FromRequest::from_request(&request),
     };
 
     Ok((request, reply))