Merge pull request #145 from tikue/master

Bump version

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tarpc"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Adam Wright <adam.austin.wright@gmail.com>", "Tim Kuehn <timothy.j.kuehn@gmail.com>"]
 license = "MIT"
 documentation = "https://docs.rs/tarpc"
@@ -26,7 +26,7 @@ net2 = "0.2"
 num_cpus = "1.0"
 serde = "0.9"
 serde_derive = "0.9"
-tarpc-plugins = { path = "src/plugins", version = "0.1" }
+tarpc-plugins = { path = "src/plugins", version = "0.1.1" }
 thread-pool = "0.1.1"
 tokio-core = "0.1.6"
 tokio-io = "0.1"

README.md

@@ -37,8 +37,8 @@ arguments to tarpc fns.
 Add to your `Cargo.toml` dependencies:
 
 ```toml
-tarpc = { git = "https://github.com/google/tarpc" }
-tarpc-plugins = { git = "https://github.com/google/tarpc" }
+tarpc = "0.7.2"
+tarpc-plugins = "0.1.1"
 ```
 
 ## Example: Sync
@@ -270,7 +270,7 @@ and the following future-based trait:
 
 ```rust,ignore
 trait FutureService {
-    type HelloFut = IntoFuture<String, Message>;
+    type HelloFut: IntoFuture<String, Message>;
 
     fn hello(&mut self, name: String) -> Self::HelloFut;
 }

src/plugins/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tarpc-plugins"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Adam Wright <adam.austin.wright@gmail.com>", "Tim Kuehn <timothy.j.kuehn@gmail.com>"]
 license = "MIT"
 documentation = "https://docs.rs/tarpc"

src/plugins/src/lib.rs

@@ -21,7 +21,7 @@ fn snake_to_camel(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree]) -> Box<MacResul
     // The `expand_expr` method is called so that any macro calls in the
     // parsed expression are expanded.
 
-    let mut item = match parser.parse_trait_item() {
+    let mut item = match parser.parse_trait_item(&mut false) {
         Ok(s) => s,
         Err(mut diagnostic) => {
             diagnostic.emit();
@@ -87,7 +87,7 @@ fn impl_snake_to_camel(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree]) -> Box<Mac
     // The `expand_expr` method is called so that any macro calls in the
     // parsed expression are expanded.
 
-    let mut item = match parser.parse_impl_item() {
+    let mut item = match parser.parse_impl_item(&mut false) {
         Ok(s) => s,
         Err(mut diagnostic) => {
             diagnostic.emit();