From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id E01EA385829A; Tue, 19 Jul 2022 21:58:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E01EA385829A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Merge #1397 X-Act-Checkin: gcc X-Git-Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 1b5676645a52f46de0011b9434f76c249fbb8d81 X-Git-Newrev: 137cd3bbaa05038b01c46f7ac7472da7ca662ed7 Message-Id: <20220719215802.E01EA385829A@sourceware.org> Date: Tue, 19 Jul 2022 21:58:02 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2022 21:58:03 -0000 https://gcc.gnu.org/g:137cd3bbaa05038b01c46f7ac7472da7ca662ed7 commit 137cd3bbaa05038b01c46f7ac7472da7ca662ed7 Merge: 1b5676645a5 66af31d5bc5 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Jul 19 11:51:22 2022 +0000 Merge #1397 1397: lexer: Allow specifiying tokens as reserved in certain editions r=CohenArthur a=CohenArthur Some tokens such as `try` only became reserved keywords in certain editions. This behavior might happen again in the future and we should be able to handle it. Closes #1395 Co-authored-by: Arthur Cohen Diff: gcc/rust/lex/rust-lex.cc | 19 +++++++++++++++++-- gcc/rust/rust-session-manager.h | 6 ++++-- gcc/testsuite/rust/compile/macro-issue1395-2.rs | 7 +++++++ gcc/testsuite/rust/compile/macro-issue1395.rs | 5 +++++ 4 files changed, 33 insertions(+), 4 deletions(-)