From 05bb22d9e86bcf4953ad2dbba36fa0adb6ebc859 Mon Sep 17 00:00:00 2001 From: holmgr Date: Wed, 10 Oct 2018 15:34:06 +0200 Subject: Remove incorrect span for second label inner macro invocation --- src/libsyntax/parse/parser.rs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d653ed819fd..08349084aa6 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -772,6 +772,11 @@ impl<'a> Parser<'a> { // | expected one of 8 possible tokens here err.span_label(self.span, label_exp); } + _ if self.prev_span == syntax_pos::DUMMY_SP => { + // Account for macro context where the previous span might not be + // available to avoid incorrect output (#54841). + err.span_label(self.span, "unexpected token"); + } _ => { err.span_label(sp, label_exp); err.span_label(self.span, "unexpected token"); -- cgit 1.4.1-3-g733a5