From d13aa62f51d7e44590a8d7fe9d6fd3d266cf1d85 Mon Sep 17 00:00:00 2001
From: Adam Wright <adam.austin.wright@gmail.com>
Date: Fri, 8 Jan 2016 03:22:58 -0800
Subject: [PATCH] No longer fully qualify my_server::*

---
 src/macros/src/lib.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/macros/src/lib.rs b/src/macros/src/lib.rs
index 43a7c45..7a6991a 100644
--- a/src/macros/src/lib.rs
+++ b/src/macros/src/lib.rs
@@ -96,20 +96,19 @@ macro_rules! rpc_service {
 mod test {
     use std::net::{TcpListener, TcpStream};
     use std::thread;
-
-    #[derive(PartialEq, Debug, RustcEncodable, RustcDecodable)]
-    pub struct Foo {
-        message: String
-    }
+    use self::my_server::*;
 
     rpc_service!(my_server:
         hello(super::Foo) -> super::Foo;
         add((i32, i32)) -> i32;
     );
 
-    //use my_server::*;
+    #[derive(PartialEq, Debug, RustcEncodable, RustcDecodable)]
+    pub struct Foo {
+        message: String
+    }
 
-    impl my_server::Service for () {
+    impl Service for () {
         fn hello(&self, s: Foo) -> Foo {
             Foo{message: format!("Hello, {}", &s.message)}
         }
@@ -124,11 +123,11 @@ mod test {
         println!("Starting");
         let listener = TcpListener::bind("127.0.0.1:9000").unwrap();
         thread::spawn(|| {
-            let server = my_server::Server::new(());
+            let server = Server::new(());
             println!("Server running");
             server.serve(listener);
         });
-        let mut client = my_server::Client(TcpStream::connect("127.0.0.1:9000").unwrap());
+        let mut client = Client(TcpStream::connect("127.0.0.1:9000").unwrap());
         assert_eq!(3, client.add((1, 2)).unwrap());
         let foo = Foo{message: "Adam".into()};
         let want = Foo{message: format!("Hello, {}", &foo.message)};