Nest server and client in their own mods

tonic-examples/src/helloworld/client.rs

@@ -4,15 +4,17 @@ pub mod hello_world {
     include!(concat!(env!("OUT_DIR"), "/helloworld.rs"));
 }
 
+use hello_world::{client::GreeterClient, HelloRequest};
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let origin = vec![http::Uri::from_static("http://[::1]:50051").into()];
 
     let svc = Channel::builder().balance_list(origin)?;
 
-    let mut client = hello_world::GreeterClient::new(svc);
+    let mut client = GreeterClient::new(svc);
 
-    let request = tonic::Request::new(hello_world::HelloRequest {
+    let request = tonic::Request::new(HelloRequest {
         name: "hello".into(),
     });
 

tonic-examples/src/helloworld/server.rs

@@ -4,17 +4,22 @@ pub mod hello_world {
     include!(concat!(env!("OUT_DIR"), "/helloworld.rs"));
 }
 
+use hello_world::{
+    server::{Greeter, GreeterServer},
+    HelloReply, HelloRequest,
+};
+
 #[derive(Default)]
 pub struct MyGreeter {
     data: String,
 }
 
 #[tonic::async_trait]
-impl hello_world::Greeter for MyGreeter {
+impl Greeter for MyGreeter {
     async fn say_hello(
         &self,
-        request: Request<hello_world::HelloRequest>,
-    ) -> Result<Response<hello_world::HelloReply>, Status> {
+        request: Request<HelloRequest>,
+    ) -> Result<Response<HelloReply>, Status> {
         println!("Got a request: {:?}", request);
 
         let string = &self.data;
@@ -34,7 +39,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let greeter = MyGreeter::default();
 
     Server::builder()
-        .serve(addr, hello_world::GreeterServer::new(greeter))
+        .serve(addr, GreeterServer::new(greeter))
         .await?;
 
     Ok(())

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?;