commit ca08542461811ff23768925c86d49479e8062408
author David Tolnay <dtolnay@gmail.com> Tue Oct 04 00:12:38 2016 -0700
committer David Tolnay <dtolnay@gmail.com> Tue Oct 04 00:12:38 2016 -0700
tree 9f49a04cc7721d88c462132c5919e0533fe8399e
parent 0aecb7388c677acc664fb2bdc7a3c6e91b446142

Trait printing

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index 9c3d2b4..ecdb05f 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -677,10 +677,7 @@
     named!(closure_arg -> FnArg, do_parse!(
         pat: pat >>
         ty: option!(preceded!(punct!(":"), ty)) >>
-        (FnArg {
-            pat: pat,
-            ty: ty.unwrap_or(Ty::Infer),
-        })
+        (FnArg::Captured(pat, ty.unwrap_or(Ty::Infer)))
     ));
 
     named!(expr_while -> Expr, do_parse!(
@@ -1032,7 +1029,7 @@
 #[cfg(feature = "printing")]
 mod printing {
     use super::*;
-    use {FunctionRetTy, Mutability, Ty};
+    use {FnArg, FunctionRetTy, Mutability, Ty};
     use attr::FilterAttrs;
     use quote::{Tokens, ToTokens};
 
@@ -1171,15 +1168,11 @@
                         if i > 0 {
                             tokens.append(",");
                         }
-                        input.pat.to_tokens(tokens);
-                        match input.ty {
-                            Ty::Infer => {
-                                // nothing
+                        match *input {
+                            FnArg::Captured(ref pat, Ty::Infer) => {
+                                pat.to_tokens(tokens);
                             }
-                            _ => {
-                                tokens.append(":");
-                                input.ty.to_tokens(tokens);
-                            }
+                            _ => input.to_tokens(tokens),
                         }
                     }
                     tokens.append("|");