Skip to content

Commit db7faa9

Browse files
authored
Merge pull request #281 from dtolnay/parse
Simplify token parse loop termination
2 parents 2b5e2f8 + 2066bdf commit db7faa9

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/parse.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ pub(crate) fn token_stream(mut input: Cursor) -> Result<TokenStream, LexError> {
166166

167167
let first = match input.bytes().next() {
168168
Some(first) => first,
169-
None => break,
169+
None if stack.is_empty() => return Ok(TokenStream { inner: trees }),
170+
None => return Err(LexError),
170171
};
171172

172173
if let Some(open_delimiter) = match first {
@@ -216,12 +217,6 @@ pub(crate) fn token_stream(mut input: Cursor) -> Result<TokenStream, LexError> {
216217
input = rest;
217218
}
218219
}
219-
220-
if stack.is_empty() && input.is_empty() {
221-
Ok(TokenStream { inner: trees })
222-
} else {
223-
Err(LexError)
224-
}
225220
}
226221

227222
fn leaf_token(input: Cursor) -> PResult<TokenTree> {

0 commit comments

Comments
 (0)