commit b5a7b144a3e52a988c51046a776aa7c06693ead1
author David Tolnay <dtolnay@gmail.com> Tue Sep 13 22:46:39 2016 -0700
committer David Tolnay <dtolnay@gmail.com> Tue Sep 13 23:57:36 2016 -0700
tree b9161cd6ea41af78e76ee092f29e86da669105a8
parent 6c9f5b6426c4302281c541059ce4f739427bf98c

Vendor a simplified nom

src/generics.rs

diff --git a/src/generics.rs b/src/generics.rs
index 8fceaca..68968e1 100644
--- a/src/generics.rs
+++ b/src/generics.rs
@@ -80,8 +80,8 @@
     use ty::parsing::{ty, poly_trait_ref};
     use nom::multispace;
 
-    named!(pub generics<&str, Generics>, do_parse!(
-        bracketed: alt_complete!(
+    named!(pub generics -> Generics, do_parse!(
+        bracketed: alt!(
             do_parse!(
                 punct!("<") >>
                 lifetimes: separated_list!(punct!(","), lifetime_def) >>
@@ -103,14 +103,14 @@
         })
     ));
 
-    named!(pub lifetime<&str, Lifetime>, preceded!(
+    named!(pub lifetime -> Lifetime, preceded!(
         punct!("'"),
         map!(ident, |id| Lifetime {
             ident: format!("'{}", id).into(),
         })
     ));
 
-    named!(pub lifetime_def<&str, LifetimeDef>, do_parse!(
+    named!(pub lifetime_def -> LifetimeDef, do_parse!(
         life: lifetime >>
         bounds: opt_vec!(preceded!(
             punct!(":"),
@@ -122,7 +122,7 @@
         })
     ));
 
-    named!(pub bound_lifetimes<&str, Vec<LifetimeDef> >, opt_vec!(do_parse!(
+    named!(pub bound_lifetimes -> Vec<LifetimeDef>, opt_vec!(do_parse!(
         punct!("for") >>
         punct!("<") >>
         lifetimes: separated_list!(punct!(","), lifetime_def) >>
@@ -130,7 +130,7 @@
         (lifetimes)
     )));
 
-    named!(ty_param<&str, TyParam>, do_parse!(
+    named!(ty_param -> TyParam, do_parse!(
         id: ident >>
         bounds: opt_vec!(preceded!(
             punct!(":"),
@@ -147,7 +147,7 @@
         })
     ));
 
-    named!(pub ty_param_bound<&str, TyParamBound>, alt_complete!(
+    named!(pub ty_param_bound -> TyParamBound, alt!(
         preceded!(punct!("?"), poly_trait_ref) => {
             |poly| TyParamBound::Trait(poly, TraitBoundModifier::Maybe)
         }
@@ -159,7 +159,7 @@
         }
     ));
 
-    named!(pub where_clause<&str, WhereClause>, alt_complete!(
+    named!(pub where_clause -> WhereClause, alt!(
         do_parse!(
             punct!("where") >>
             multispace >>
@@ -171,7 +171,7 @@
         epsilon!() => { |_| Default::default() }
     ));
 
-    named!(where_predicate<&str, WherePredicate>, alt_complete!(
+    named!(where_predicate -> WherePredicate, alt!(
         do_parse!(
             ident: lifetime >>
             punct!(":") >>