提交 4d37c537 authored 作者: Serhij S's avatar Serhij S

error fixes

上级 9b22ca30
...@@ -473,24 +473,36 @@ where ...@@ -473,24 +473,36 @@ where
{ {
let mut data = Cursor::new(vec![]); let mut data = Cursor::new(vec![]);
value.write_le(&mut data)?; value.write_le(&mut data)?;
self.inner.tx.try_send(PushPayload::DObj { self.inner
.tx
.try_send(PushPayload::DObj {
name: name.clone(), name: name.clone(),
data: data.into_inner(), data: data.into_inner(),
}) })
.map_err(Into::into)
} }
pub fn dobj_error(&self, name: Arc<String>) -> Result<()> { pub fn dobj_error(&self, name: Arc<String>) -> Result<()> {
self.inner.tx.try_send(PushPayload::DObjError(name)) self.inner
.tx
.try_send(PushPayload::DObjError(name))
.map_err(Into::into)
} }
pub fn state_push<T: Serialize>(&self, oid: Arc<OID>, value: T) -> Result<()> { pub fn state_push<T: Serialize>(&self, oid: Arc<OID>, value: T) -> Result<()> {
self.inner.tx.try_send(PushPayload::State { self.inner
.tx
.try_send(PushPayload::State {
oid, oid,
event: RawStateEventOwned::new(1, to_value(value).map_err(Error::invalid_data)?), event: RawStateEventOwned::new(1, to_value(value).map_err(Error::invalid_data)?),
}) })
.map_err(Into::into)
} }
pub fn state_error(&self, oid: Arc<OID>) -> Result<()> { pub fn state_error(&self, oid: Arc<OID>) -> Result<()> {
self.inner.tx.try_send(PushPayload::State { self.inner
.tx
.try_send(PushPayload::State {
oid, oid,
event: RawStateEventOwned::new0(eva_common::ITEM_STATUS_ERROR), event: RawStateEventOwned::new0(eva_common::ITEM_STATUS_ERROR),
}) })
.map_err(Into::into)
} }
} }
...@@ -23,7 +23,7 @@ pub struct Reader { ...@@ -23,7 +23,7 @@ pub struct Reader {
impl Reader { impl Reader {
pub fn line(&self) -> Result<String> { pub fn line(&self) -> Result<String> {
self.rx.recv_blocking() self.rx.recv_blocking().map_err(Into::into)
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论