Update dependencies of async-log-attributes and make it to be optional

.travis.yml

@@ -7,7 +7,9 @@ before_script: |
   rustup component add clippy-preview
 script: |
   cargo fmt -- --check &&
-  cargo clippy -- -D clippy &&
+  cargo clippy -- -D all &&
   cargo build --verbose &&
-  cargo test  --verbose
+  cargo build --no-default-features --verbose &&
+  cargo test  --verbose &&
+  cargo test --no-default-features --verbose
 cache: cargo

Cargo.toml

@@ -11,14 +11,23 @@ authors = ["Yoshua Wuyts <[email protected]>"]
 readme = "README.md"
 edition = "2018"
 
+[features]
+default = ["attributes"]
+attributes = ["async-log-attributes"]
+
 [dependencies]
 log = { version = "0.4.8", features = ["std", "kv_unstable"] }
 backtrace = "0.3.34"
-async-log-attributes = { path = "async-log-attributes", version = "1.0.1" }
+async-log-attributes = { path = "async-log-attributes", version = "1.0.1", optional = true }
 
 [dev-dependencies]
 femme = "1.2.0"
 
+[[example]]
+name = "trace"
+path = "examples/trace.rs"
+required-features = ["attributes"]
+
 [workspace]
 members = [
   ".",

async-log-attributes/Cargo.toml

@@ -16,6 +16,6 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-syn = { version = "0.15.33", features = ["full"] }
-proc-macro2 = { version = "0.4.29", features = ["nightly"] }
-quote = "0.6.12"
+syn = { version = "1.0", features = ["full"] }
+proc-macro2 = "1.0"
+quote = "1.0"

async-log-attributes/src/lib.rs

@@ -4,8 +4,6 @@
 #![deny(missing_debug_implementations, nonstandard_style)]
 #![recursion_limit = "512"]
 
-extern crate proc_macro;
-
 use proc_macro::TokenStream;
 use quote::{quote, quote_spanned};
 use syn::spanned::Spanned;
@@ -17,25 +15,25 @@ pub fn instrument(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
     let attrs = &input.attrs;
     let vis = &input.vis;
-    let constness = &input.constness;
-    let unsafety = &input.unsafety;
-    let asyncness = &input.asyncness;
-    let abi = &input.abi;
-
-    let generics = &input.decl.generics;
-    let name = &input.ident;
-    let inputs = &input.decl.inputs;
-    let output = &input.decl.output;
+    let constness = &input.sig.constness;
+    let unsafety = &input.sig.unsafety;
+    let asyncness = &input.sig.asyncness;
+    let abi = &input.sig.abi;
+
+    let generics = &input.sig.generics;
+    let name = &input.sig.ident;
+    let inputs = &input.sig.inputs;
+    let output = &input.sig.output;
     let body = &input.block.stmts;
 
     let mut names = String::new();
     let mut args = Vec::<syn::Pat>::new();
 
     for fn_arg in inputs {
-        if let syn::FnArg::Captured(arg) = fn_arg {
+        if let syn::FnArg::Typed(arg) = fn_arg {
             let pat = arg.pat.clone();
 
-            if let syn::Pat::Ident(pat_ident) = &pat {
+            if let syn::Pat::Ident(pat_ident) = &*pat {
                 names.push_str(&format!(", {}={{:?}}", pat_ident.ident));
             } else {
                 let tokens = quote_spanned! { fn_arg.span() =>
@@ -44,10 +42,12 @@ pub fn instrument(_attr: TokenStream, item: TokenStream) -> TokenStream {
                 return TokenStream::from(tokens);
             }
 
-            args.push(pat);
+            args.push(*pat);
         }
     }
 
+    let inputs = inputs.iter();
+
     let result = quote! {
         #(#attrs)*
         #vis #constness #unsafety #asyncness #abi fn #name #generics (#(#inputs)*) #output {

src/lib.rs

@@ -88,26 +88,27 @@
 //!         .unwrap();
 //! }
 //!
-//! fn main() {
-//!     setup_logger();
 //!
-//!     span!("new level, depth={}", 1, {
-//!         let x = "beep";
-//!         info!("look at this value, x={}", x);
+//! setup_logger();
 //!
-//!         span!("new level, depth={}", 2, {
-//!             let y = "boop";
-//!             info!("another nice value, y={}", y);
-//!         })
+//! span!("new level, depth={}", 1, {
+//!     let x = "beep";
+//!     info!("look at this value, x={}", x);
+//!
+//!     span!("new level, depth={}", 2, {
+//!         let y = "boop";
+//!         info!("another nice value, y={}", y);
 //!     })
-//! }
+//! })
+//!
 //! ```
 
 #![forbid(unsafe_code, future_incompatible, rust_2018_idioms)]
 #![deny(missing_debug_implementations, nonstandard_style)]
 #![warn(missing_docs, unreachable_pub)]
 #![cfg_attr(test, deny(warnings))]
 
+#[cfg(feature = "attributes")]
 pub use async_log_attributes::instrument;
 
 use std::fmt::Arguments;