Move HandleToExchange to export_import.rs

It is paired with Skeleton. More natural to be there

Author: Junha Yang

remote-trait-object/src/context.rs

@@ -184,9 +184,9 @@ impl Context {
         let port_weak = Arc::downgrade(&port) as Weak<dyn Port>;
         let meta_service = <Box<dyn MetaService> as ImportProxy<dyn MetaService>>::import_proxy(
             Weak::clone(&port_weak),
-            crate::service::HandleToExchange(crate::forwarder::META_SERVICE_OBJECT_ID),
+            HandleToExchange(crate::forwarder::META_SERVICE_OBJECT_ID),
         );
-        let initial_handle = crate::service::HandleToExchange(crate::forwarder::INITIAL_SERVICE_OBJECT_ID);
+        let initial_handle = HandleToExchange(crate::forwarder::INITIAL_SERVICE_OBJECT_ID);
 
         let ctx = Context {
             config,

remote-trait-object/src/lib.rs

@@ -36,9 +36,8 @@ pub mod raw_exchange {
     //! This module is needed only you want to perform some raw exchange (or export/import) of services.
 
     pub use crate::service::export_import::{
-        export_service_into_handle, import_service_from_handle, ImportProxy, IntoSkeleton, Skeleton,
+        export_service_into_handle, import_service_from_handle, HandleToExchange, ImportProxy, IntoSkeleton, Skeleton,
     };
-    pub use crate::service::HandleToExchange;
 }
 
 #[doc(hidden)]

remote-trait-object/src/port.rs

@@ -22,7 +22,7 @@ pub use self::types::Handler;
 use crate::forwarder::ServiceForwarder;
 use crate::forwarder::{ServiceObjectId, DELETE_REQUEST};
 use crate::packet::{Packet, PacketView};
-use crate::raw_exchange::Skeleton;
+use crate::raw_exchange::{HandleToExchange, Skeleton};
 use crate::service::*;
 use crate::Config;
 use client::Client;

remote-trait-object/src/service.rs

@@ -22,19 +22,12 @@ pub mod serde_support;
 
 use crate::forwarder::ServiceObjectId;
 use crate::port::Port;
-use serde::{Deserialize, Serialize};
 use std::sync::Weak;
 
 pub use handle::Handle;
 pub use null::{create_null_service, NullService};
 pub type MethodId = u32;
 
-/// This represents transportable identifier of the service object
-/// and should be enough to construct a handle along with the pointer to the port
-/// which this service belong to
-#[derive(PartialEq, Serialize, Deserialize, Debug, Clone, Copy)]
-pub struct HandleToExchange(pub(crate) ServiceObjectId);
-
 /// Exporter sides's interface to the service object. This will be implemented
 /// by each service trait's unique wrapper in the macro
 pub trait Dispatch: Send + Sync {

remote-trait-object/src/service/export_import.rs

@@ -16,8 +16,15 @@
 
 use super::Dispatch;
 use super::*;
+use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
+/// This represents transportable identifier of the service object
+/// and should be enough to construct a handle along with the pointer to the port
+/// which this service belong to
+#[derive(PartialEq, Serialize, Deserialize, Debug, Clone, Copy)]
+pub struct HandleToExchange(pub(crate) ServiceObjectId);
+
 pub struct Skeleton {
     pub(crate) raw: Arc<dyn Dispatch>,
 }

remote-trait-object/src/service/handle.rs

@@ -16,6 +16,7 @@
 
 use super::*;
 use crate::packet::Packet;
+use crate::raw_exchange::HandleToExchange;
 use crate::service::{MethodId, SerdeFormat};
 
 /// Proxy service will carry this.

remote-trait-object/src/tests.rs

@@ -22,7 +22,7 @@ use remote_trait_object_macro as rto_macro;
 use crate::forwarder::ServiceObjectId;
 use crate::packet::{Packet, PacketView};
 use crate::port::*;
-use crate::raw_exchange::{ImportProxy, IntoSkeleton};
+use crate::raw_exchange::{HandleToExchange, ImportProxy, IntoSkeleton};
 use crate::service::*;
 use parking_lot::Mutex;
 use std::collections::HashMap;