未验证 提交 b802ad93 编写于 作者: O openharmony_ci 提交者: Gitee

!604 修改函数命名

Merge pull request !604 from Yanying/master
......@@ -100,7 +100,7 @@ macro_rules! define_remote_object {
impl $crate::FromRemoteObj for dyn $remote_broker {
/// For example, convert RemoteObj to RemoteObjRef<dyn ITest>
fn from(object: $crate::RemoteObj)
fn try_from(object: $crate::RemoteObj)
-> $crate::Result<$crate::RemoteObjRef<dyn $remote_broker>> {
Ok($crate::RemoteObjRef::new(Box::new($proxy::from_remote_object(&object)?)))
}
......
......@@ -70,7 +70,7 @@ pub trait IRemoteBroker: Send + Sync {
/// dynamic trait object: IRemoteObject. For example, "dyn ITest" should implements this trait
pub trait FromRemoteObj: IRemoteBroker {
/// Convert a RemoteObj to RemoteObjeRef
fn from(object: RemoteObj) -> Result<RemoteObjRef<Self>>;
fn try_from(object: RemoteObj) -> Result<RemoteObjRef<Self>>;
}
/// Strong reference for "dyn IRemoteBroker" object, for example T is "dyn ITest"
......@@ -94,7 +94,7 @@ impl<T: FromRemoteObj + ?Sized> Deref for RemoteObjRef<T> {
impl<I: FromRemoteObj + ?Sized> Clone for RemoteObjRef<I> {
fn clone(&self) -> Self {
// non None
FromRemoteObj::from(self.0.as_object().unwrap()).unwrap()
FromRemoteObj::try_from(self.0.as_object().unwrap()).unwrap()
}
}
......
......@@ -37,7 +37,7 @@ use std::fs::File;
fn get_test_service() -> RemoteObjRef<dyn ITest>
{
let object = get_service(IPC_TEST_SERVICE_ID).expect("get itest service failed");
let remote = <dyn ITest as FromRemoteObj>::from(object);
let remote = <dyn ITest as FromRemoteObj>::try_from(object);
let remote = match remote {
Ok(x) => x,
Err(error) => {
......@@ -208,7 +208,7 @@ fn test_loop_request() {
fn test_remote_obj() {
let remote = get_test_service();
let remote = remote.test_get_foo_service().expect("get FooService proxy failed");
<dyn IFoo as FromRemoteObj>::from(remote).expect(
<dyn IFoo as FromRemoteObj>::try_from(remote).expect(
"convert foo service should success");
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册