trinity-1686a/netapp
1
0
Fork 0
forked from lx/netapp
Code Issues Pull requests 1 Projects Releases Wiki Activity

Remove useless phantom and pub(crate)

Browse source
This commit is contained in:
Alex 2022-08-31 22:19:40 +02:00
parent b55f61c38b
commit 2c9d595da0
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/message.rs
View file

@ -53,7 +53,6 @@ pub trait Message: Serialize + for<'de> Deserialize<'de> + Send + Sync + 'static
/// Req<M> is cheaply clonable to allow the request to be sent to different /// Req<M> is cheaply clonable to allow the request to be sent to different
/// peers (Clone will panic if the stream is a ByteStream). /// peers (Clone will panic if the stream is a ByteStream).
pub struct Req<M: Message> { pub struct Req<M: Message> {
pub(crate) _phantom: PhantomData<M>,
pub(crate) msg: Arc<M>, pub(crate) msg: Arc<M>,
pub(crate) msg_ser: Option<Bytes>, pub(crate) msg_ser: Option<Bytes>,
pub(crate) stream: AttachedStream, pub(crate) stream: AttachedStream,
@ -104,7 +103,6 @@ impl<M: Message> Req<M> {
pub(crate) fn from_enc(enc: ReqEnc) -> Result<Self, rmp_serde::decode::Error> { pub(crate) fn from_enc(enc: ReqEnc) -> Result<Self, rmp_serde::decode::Error> {
let msg = rmp_serde::decode::from_read_ref(&enc.msg)?; let msg = rmp_serde::decode::from_read_ref(&enc.msg)?;
Ok(Req { Ok(Req {
_phantom: Default::default(),
msg: Arc::new(msg), msg: Arc::new(msg),
msg_ser: Some(enc.msg), msg_ser: Some(enc.msg),
stream: enc stream: enc
@ -124,7 +122,6 @@ impl<M: Message> IntoReq<M> for M {
fn into_req(self) -> Result<Req<M>, rmp_serde::encode::Error> { fn into_req(self) -> Result<Req<M>, rmp_serde::encode::Error> {
let msg_ser = rmp_to_vec_all_named(&self)?; let msg_ser = rmp_to_vec_all_named(&self)?;
Ok(Req { Ok(Req {
_phantom: Default::default(),
msg: Arc::new(self), msg: Arc::new(self),
msg_ser: Some(Bytes::from(msg_ser)), msg_ser: Some(Bytes::from(msg_ser)),
stream: AttachedStream::None, stream: AttachedStream::None,
@ -132,7 +129,6 @@ impl<M: Message> IntoReq<M> for M {
} }
fn into_req_local(self) -> Req<M> { fn into_req_local(self) -> Req<M> {
Req { Req {
_phantom: Default::default(),
msg: Arc::new(self), msg: Arc::new(self),
msg_ser: None, msg_ser: None,
stream: AttachedStream::None, stream: AttachedStream::None,
@ -159,7 +155,6 @@ impl<M: Message> Clone for Req<M> {
} }
}; };
Self { Self {
_phantom: Default::default(),
msg: self.msg.clone(), msg: self.msg.clone(),
msg_ser: self.msg_ser.clone(), msg_ser: self.msg_ser.clone(),
stream, stream,
@ -331,7 +326,7 @@ impl ReqEnc {
Self::decode_aux(stream).await.map_err(|_| Error::Framing) Self::decode_aux(stream).await.map_err(|_| Error::Framing)
} }
pub(crate) async fn decode_aux(stream: ByteStream) -> Result<Self, ReadExactError> { async fn decode_aux(stream: ByteStream) -> Result<Self, ReadExactError> {
let mut reader = ByteStreamReader::new(stream); let mut reader = ByteStreamReader::new(stream);
let prio = reader.read_u8().await?; let prio = reader.read_u8().await?;
@ -415,7 +410,7 @@ impl RespEnc {
Self::decode_aux(stream).await.map_err(|_| Error::Framing) Self::decode_aux(stream).await.map_err(|_| Error::Framing)
} }
pub(crate) async fn decode_aux(stream: ByteStream) -> Result<Self, ReadExactError> { async fn decode_aux(stream: ByteStream) -> Result<Self, ReadExactError> {
let mut reader = ByteStreamReader::new(stream); let mut reader = ByteStreamReader::new(stream);
let is_err = reader.read_u8().await?; let is_err = reader.read_u8().await?;