commit 65e7f308aadef5843d2b5058ba4592940e740835
author David Tolnay <dtolnay@gmail.com> Sun Sep 04 10:19:25 2016 -0700
committer David Tolnay <dtolnay@gmail.com> Sun Sep 04 10:19:25 2016 -0700
tree f1da7b2859d797e053eac7da0d0d6bc6ee434c5a
parent b79ee96316b1985db99a74a9ee8cebc6471cf699

Stop renaming multispace

src/common.rs

diff --git a/src/common.rs b/src/common.rs
index c7a2609..3cd8587 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -16,7 +16,7 @@
 ));
 
 named!(pub visibility<&str, Visibility>, preceded!(
-    opt!(call!(::nom::space)),
+    opt!(call!(::nom::multispace)),
     alt!(
         terminated!(tag_s!("pub"), call!(::nom::multispace)) => { |_| Visibility::Public }
         |

src/generics.rs

diff --git a/src/generics.rs b/src/generics.rs
index 26c7d30..92a6a1d 100644
--- a/src/generics.rs
+++ b/src/generics.rs
@@ -2,7 +2,7 @@
 
 use common::word;
 use ty::{ty, poly_trait_ref};
-use nom::multispace as space;
+use nom::multispace;
 
 #[derive(Debug, Clone, Eq, PartialEq, Default)]
 pub struct Generics {
@@ -84,7 +84,7 @@
     ) ~
     where_clause: opt_vec!(chain!(
         punct!("where") ~
-        space ~
+        multispace ~
         predicates: separated_nonempty_list!(punct!(","), where_predicate) ~
         punct!(",")? ~
         move || predicates

src/item.rs

diff --git a/src/item.rs b/src/item.rs
index a1d8358..cab2685 100644
--- a/src/item.rs
+++ b/src/item.rs
@@ -4,7 +4,7 @@
 use common::{word, visibility};
 use generics::generics;
 use ty::ty;
-use nom::multispace as space;
+use nom::multispace;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Item {
@@ -48,7 +48,7 @@
     attrs: many0!(attribute) ~
     vis: visibility ~
     which: alt!(tag_s!("struct") | tag_s!("enum")) ~
-    space ~
+    multispace ~
     ident: word ~
     generics: generics ~
     item: switch!(value!(which),
@@ -68,7 +68,7 @@
             body: body,
         })
     ) ~
-    space?,
+    multispace?,
     move || item
 ));
 

src/ty.rs

diff --git a/src/ty.rs b/src/ty.rs
index 0d28e65..4aa3199 100644
--- a/src/ty.rs
+++ b/src/ty.rs
@@ -2,7 +2,7 @@
 
 use common::word;
 use generics::{lifetime, lifetime_def, ty_param_bound, bound_lifetimes};
-use nom::{digit, multispace as space};
+use nom::{digit, multispace};
 
 use std::str;
 
@@ -197,7 +197,7 @@
         punct!("[") ~
         elem: ty ~
         punct!(";") ~
-        space? ~
+        multispace? ~
         size: map_res!(digit, str::parse),
         move || Ty::FixedLengthVec(Box::new(elem), size)
     )
@@ -229,7 +229,7 @@
     |
     chain!(
         punct!("fn") ~
-        space ~
+        multispace ~
         lifetimes: opt_vec!(delimited!(
             punct!("<"),
             separated_list!(punct!(","), lifetime_def),
@@ -268,7 +268,7 @@
         punct!("<") ~
         this: map!(ty, Box::new) ~
         path: opt!(preceded!(
-            tuple!(punct!("as"), space),
+            tuple!(punct!("as"), multispace),
             path
         )) ~
         punct!(">") ~
@@ -292,7 +292,7 @@
     )
     |
     preceded!(
-        tuple!(punct!("impl"), space),
+        tuple!(punct!("impl"), multispace),
         separated_nonempty_list!(punct!("+"), ty_param_bound)
     ) => { Ty::ImplTrait }
     |
@@ -304,9 +304,9 @@
 ));
 
 named!(mutability<&str, Mutability>, preceded!(
-    opt!(space),
+    opt!(multispace),
     alt!(
-        terminated!(tag_s!("mut"), space) => { |_| Mutability::Mutable }
+        terminated!(tag_s!("mut"), multispace) => { |_| Mutability::Mutable }
         |
         epsilon!() => { |_| Mutability::Immutable }
     )