Method refactor now compiles

orchid-extension/src/entrypoint.rs

@@ -1,12 +1,12 @@
 use std::cell::RefCell;
 use std::future::Future;
+use std::mem;
 use std::num::NonZero;
 use std::pin::Pin;
 use std::rc::Rc;
-use std::{io, mem};
 
 use futures::future::{LocalBoxFuture, join_all};
-use futures::{AsyncRead, AsyncWrite, AsyncWriteExt, StreamExt, stream};
+use futures::{AsyncWriteExt, StreamExt, stream};
 use hashbrown::HashMap;
 use itertools::Itertools;
 use orchid_api_traits::{Decode, Encode, Request, UnderRoot, enc_vec};
@@ -17,8 +17,7 @@ use orchid_base::logging::{log, with_logger};
 use orchid_base::name::Sym;
 use orchid_base::parse::{Comment, Snippet};
 use orchid_base::reqnot::{
-	Client, ClientExt, CommCtx, MsgReader, MsgReaderExt, Receipt, RepWriter, ReqHandle, ReqHandleExt,
-	ReqReader, ReqReaderExt, Witness, io_comm,
+	Client, ClientExt, CommCtx, MsgReader, MsgReaderExt, ReqHandleExt, ReqReaderExt, Witness, io_comm,
 };
 use orchid_base::stash::with_stash;
 use orchid_base::tree::{TokenVariant, ttv_from_api};
@@ -39,6 +38,7 @@ use crate::reflection::with_refl_roots;
 use crate::system::{SysCtx, atom_by_idx, cted, with_sys};
 use crate::system_ctor::{CtedObj, DynSystemCtor, SystemCtor};
 use crate::tree::{TreeIntoApiCtxImpl, get_lazy, with_lazy_member_store};
+use crate::trivial_req::TrivialReqCycle;
 
 task_local::task_local! {
 	static CLIENT: Rc<dyn Client>;
@@ -219,36 +219,6 @@ impl ExtensionBuilder {
 								let fwd_tok = Witness::of(&fwd);
 								let api::SysFwded(sys_id, payload) = fwd;
 								with_sys_record(sys_id, async {
-									struct TrivialReqCycle<'a> {
-										req: &'a [u8],
-										rep: &'a mut Vec<u8>,
-									}
-									impl<'a> ReqReader<'a> for TrivialReqCycle<'a> {
-										fn reader(&mut self) -> Pin<&mut dyn AsyncRead> {
-											Pin::new(&mut self.req) as Pin<&mut _>
-										}
-										fn finish(self: Box<Self>) -> LocalBoxFuture<'a, Box<dyn ReqHandle<'a> + 'a>> {
-											Box::pin(async { self as Box<_> })
-										}
-									}
-									impl<'a> ReqHandle<'a> for TrivialReqCycle<'a> {
-										fn start_reply(
-											self: Box<Self>,
-										) -> LocalBoxFuture<'a, io::Result<Box<dyn RepWriter<'a> + 'a>>> {
-											Box::pin(async { Ok(self as Box<_>) })
-										}
-									}
-									impl<'a> RepWriter<'a> for TrivialReqCycle<'a> {
-										fn writer(&mut self) -> Pin<&mut dyn AsyncWrite> {
-											Pin::new(&mut self.rep) as Pin<&mut _>
-										}
-										fn finish(
-											self: Box<Self>,
-										) -> LocalBoxFuture<'a, io::Result<orchid_base::reqnot::Receipt<'a>>>
-										{
-											Box::pin(async { Ok(Receipt::_new()) })
-										}
-									}
 									let mut reply = Vec::new();
 									let req = TrivialReqCycle { req: &payload, rep: &mut reply };
 									let _ = cted().inst().dyn_request(Box::new(req)).await;
@@ -349,14 +319,8 @@ impl ExtensionBuilder {
 											let api::Fwded(_, key, payload) = &fwded;
 											let mut reply = Vec::new();
 											let key = Sym::from_api(*key).await;
-											let some = nfo
-												.handle_req(
-													actx,
-													key,
-													Pin::<&mut &[u8]>::new(&mut &payload[..]),
-													Pin::<&mut Vec<_>>::new(&mut reply),
-												)
-												.await;
+											let req = TrivialReqCycle { req: payload, rep: &mut reply };
+											let some = nfo.handle_req(actx, key, Box::new(req)).await;
 											handle.reply(fwded, &some.then_some(reply)).await
 										},
 										api::AtomReq::CallRef(call @ api::CallRef(_, arg)) => {