commit 00f81fdc12d95cd28a5dfba9adc2c6811f8d33cf
author David Tolnay <dtolnay@gmail.com> Sat Sep 01 10:50:12 2018 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Sep 01 10:50:12 2018 -0700
tree 6109487195c34d7fe97217a5adab272fd99665e5
parent 9b00f65ac9f8b907e84b178964a88f671ff9004f

Remove Lookahead1::cursor method

src/token.rs

diff --git a/src/token.rs b/src/token.rs
index 2e54077..68f9475 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -106,6 +106,8 @@
 use quote::{ToTokens, TokenStreamExt};
 
 #[cfg(feature = "parsing")]
+use buffer::Cursor;
+#[cfg(feature = "parsing")]
 use error::Result;
 #[cfg(any(feature = "full", feature = "derive"))]
 #[cfg(feature = "parsing")]
@@ -116,7 +118,7 @@
 #[cfg(feature = "parsing")]
 use lookahead;
 #[cfg(feature = "parsing")]
-use parse::{Lookahead1, Parse, ParseStream};
+use parse::{Parse, ParseStream};
 use span::IntoSpans;
 
 /// Marker trait for types that represent single tokens.
@@ -126,7 +128,7 @@
 pub trait Token: private::Sealed {
     // Not public API.
     #[doc(hidden)]
-    fn peek(lookahead: &Lookahead1) -> bool;
+    fn peek(cursor: Cursor) -> bool;
 
     // Not public API.
     #[doc(hidden)]
@@ -142,10 +144,9 @@
     ($name:ident $display:expr) => {
         #[cfg(feature = "parsing")]
         impl Token for $name {
-            fn peek(lookahead: &Lookahead1) -> bool {
+            fn peek(cursor: Cursor) -> bool {
                 // TODO factor out in a way that can be compiled just once
                 let scope = Span::call_site();
-                let cursor = lookahead.cursor();
                 let unexpected = Rc::new(Cell::new(None));
                 ::private::new_parse_buffer(scope, cursor, unexpected)
                     .parse::<Self>()
@@ -423,8 +424,8 @@
 
 #[cfg(feature = "parsing")]
 impl Token for Paren {
-    fn peek(lookahead: &Lookahead1) -> bool {
-        lookahead::is_delimiter(lookahead, Delimiter::Parenthesis)
+    fn peek(cursor: Cursor) -> bool {
+        lookahead::is_delimiter(cursor, Delimiter::Parenthesis)
     }
 
     fn display() -> String {
@@ -434,8 +435,8 @@
 
 #[cfg(feature = "parsing")]
 impl Token for Brace {
-    fn peek(lookahead: &Lookahead1) -> bool {
-        lookahead::is_delimiter(lookahead, Delimiter::Brace)
+    fn peek(cursor: Cursor) -> bool {
+        lookahead::is_delimiter(cursor, Delimiter::Brace)
     }
 
     fn display() -> String {
@@ -445,8 +446,8 @@
 
 #[cfg(feature = "parsing")]
 impl Token for Bracket {
-    fn peek(lookahead: &Lookahead1) -> bool {
-        lookahead::is_delimiter(lookahead, Delimiter::Bracket)
+    fn peek(cursor: Cursor) -> bool {
+        lookahead::is_delimiter(cursor, Delimiter::Bracket)
     }
 
     fn display() -> String {
@@ -456,8 +457,8 @@
 
 #[cfg(feature = "parsing")]
 impl Token for Group {
-    fn peek(lookahead: &Lookahead1) -> bool {
-        lookahead::is_delimiter(lookahead, Delimiter::None)
+    fn peek(cursor: Cursor) -> bool {
+        lookahead::is_delimiter(cursor, Delimiter::None)
     }
 
     fn display() -> String {