From 0e505d427a573de2b1ba9d493171c2da0df9f12b Mon Sep 17 00:00:00 2001 From: Esteban Küber Date: Wed, 24 Apr 2019 16:45:29 -0700 Subject: Add guard for missing comma in macro call suggestion --- src/libsyntax/tokenstream.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs index 2d47b982ebd..93b5ecadd14 100644 --- a/src/libsyntax/tokenstream.rs +++ b/src/libsyntax/tokenstream.rs @@ -182,8 +182,10 @@ impl TokenStream { (_, (TokenTree::Token(_, token::Token::Comma), _)) => continue, ((TokenTree::Token(sp, token_left), NonJoint), (TokenTree::Token(_, token_right), _)) - if (token_left.is_ident() || token_left.is_lit()) && - (token_right.is_ident() || token_right.is_lit()) => *sp, + if ((token_left.is_ident() && !token_left.is_reserved_ident()) + || token_left.is_lit()) && + ((token_right.is_ident() && !token_right.is_reserved_ident()) + || token_right.is_lit()) => *sp, ((TokenTree::Delimited(sp, ..), NonJoint), _) => sp.entire(), _ => continue, }; -- cgit 1.4.1-3-g733a5