Nest server and client in their own mods

tonic-examples/src/routeguide/client.rs

@@ -8,12 +8,14 @@ mod route_guide {
     include!(concat!(env!("OUT_DIR"), "/routeguide.rs"));
 }
 
+use route_guide::client::RouteGuideClient;
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let origin = http::Uri::from_static("http://[::1]:10000");
 
     let svc = Channel::builder().build(origin)?;
-    let mut client = route_guide::RouteGuideClient::new(svc);
+    let mut client = RouteGuideClient::new(svc);
 
     let start = Instant::now();
 

tonic-examples/src/routeguide/server.rs

@@ -14,7 +14,7 @@ pub mod routeguide {
     include!(concat!(env!("OUT_DIR"), "/routeguide.rs"));
 }
 
-use routeguide::{Feature, Point, Rectangle, RouteNote, RouteSummary};
+use routeguide::{server, Feature, Point, Rectangle, RouteNote, RouteSummary};
 
 #[derive(Debug)]
 pub struct RouteGuide {
@@ -28,7 +28,7 @@ struct State {
 }
 
 #[tonic::async_trait]
-impl routeguide::RouteGuide for RouteGuide {
+impl server::RouteGuide for RouteGuide {
     async fn get_feature(&self, request: Request<Point>) -> Result<Response<Feature>, Status> {
         println!("GetFeature = {:?}", request);
 
@@ -168,7 +168,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         },
     };
 
-    let svc = routeguide::RouteGuideServer::new(route_guide);
+    let svc = server::RouteGuideServer::new(route_guide);
 
     Server::builder().serve(addr, svc).await?;