Convert tarpc::service! function macro to #[tarpc::service] attribute macro

.travis.yml

@@ -11,3 +11,4 @@ os:
 script:
   - cargo test --all-targets --all-features
   - cargo test --doc --all-features
+  - cargo run --example 2>&1 | grep '    ' | awk '{print $1}' | xargs -L 1 cargo run --all-features --example

README.md

@@ -76,9 +76,10 @@ use std::io;
 
 // This is the service definition. It looks a lot like a trait definition.
 // It defines one RPC, hello, which takes one arg, name, and returns a String.
-tarpc::service! {
+#[tarpc::service]
+trait Service {
     /// Returns a greeting for name.
-    rpc hello(name: String) -> String;
+    async fn hello(name: String) -> String;
 }
 ```
 
@@ -102,9 +103,10 @@ implement it for our Server struct.
 #
 # // This is the service definition. It looks a lot like a trait definition.
 # // It defines one RPC, hello, which takes one arg, name, and returns a String.
-# tarpc::service! {
+# #[tarpc::service]
+# trait Service {
 #     /// Returns a greeting for name.
-#     rpc hello(name: String) -> String;
+#     async fn hello(name: String) -> String;
 # }
 #
 // This is the type that implements the generated Service trait. It is the business logic
@@ -147,9 +149,10 @@ that uses bincode over TCP.
 #
 # // This is the service definition. It looks a lot like a trait definition.
 # // It defines one RPC, hello, which takes one arg, name, and returns a String.
-# tarpc::service! {
+# #[tarpc::service]
+# trait Service {
 #     /// Returns a greeting for name.
-#     rpc hello(name: String) -> String;
+#     async fn hello(name: String) -> String;
 # }
 #
 # // This is the type that implements the generated Service trait. It is the business logic
@@ -198,7 +201,6 @@ async fn main() -> io::Result<()> {
 }
 ```
 
-
 ## Service Documentation
 
 Use `cargo doc` as you normally would to see the documentation created for all

example-service/src/lib.rs

@@ -4,15 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-#![feature(async_await, proc_macro_hygiene)]
+#![feature(async_await)]
 
-// This is the service definition. It looks a lot like a trait definition.
-// It defines one RPC, hello, which takes one arg, name, and returns a String.
-tarpc::service! {
+/// This is the service definition. It looks a lot like a trait definition.
+/// It defines one RPC, hello, which takes one arg, name, and returns a String.
+#[tarpc::service]
+pub trait Service {
     /// Returns a greeting for name.
-    rpc hello(#[serde(default = "default_name")] name: String) -> String;
-}
-
-fn default_name() -> String {
-    "DefaultName".into()
+    async fn hello(name: String) -> String;
 }

hooks/pre-push

@@ -91,7 +91,11 @@ if [ "$?" == 0 ]; then
 
     try_run "Building ... " cargo build --color=always
     try_run "Testing ... " cargo test --color=always
-    try_run "Doc Test ... " cargo clean && cargo build --tests && rustdoc --test README.md --edition 2018 -L target/debug/deps -Z unstable-options
+    try_run "Testing with all features enabled ... " cargo test --all-features --color=always
+    for EXAMPLE in $(cargo run --example 2>&1 | grep '    ' | awk '{print $1}')
+    do
+        try_run "Running example \"$EXAMPLE\" ... " cargo run --all-features --example $EXAMPLE
+    done
 
 fi
 

plugins/Cargo.toml

@@ -2,6 +2,7 @@
 name = "tarpc-plugins"
 version = "0.5.1"
 authors = ["Adam Wright <[email protected]>", "Tim Kuehn <[email protected]>"]
+edition = "2018"
 license = "MIT"
 documentation = "https://docs.rs/tarpc-plugins"
 homepage = "https://github.com/google/tarpc"
@@ -11,6 +12,9 @@ categories = ["asynchronous", "network-programming"]
 readme = "../README.md"
 description = "Proc macros for tarpc."
 
+[features]
+serde1 = []
+
 [badges]
 travis-ci = { repository = "google/tarpc" }
 
@@ -22,3 +26,17 @@ proc-macro2 = "0.4"
 
 [lib]
 proc-macro = true
+
+[dev-dependencies]
+bincode = "1"
+bincode-transport = { package = "tarpc-bincode-transport", version = "0.7", path = "../bincode-transport" }
+bytes = { version = "0.4", features = ["serde"] }
+futures-preview = { version = "0.3.0-alpha.17", features = ["compat"] }
+humantime = "1.0"
+env_logger = "0.6"
+serde = { version = "1.0", features = ["derive"] }
+tarpc = { path = "../tarpc" }
+tokio = "0.1"
+tokio-executor = "0.1"
+tokio-tcp = "0.1"
+pin-utils = "0.1.0-alpha.4"