public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] Merge #1397
@ 2022-07-19 21:58 Thomas Schwinge
  0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2022-07-19 21:58 UTC (permalink / raw)
  To: gcc-cvs

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 <arthur.cohen@embecosm.com>

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(-)


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2022-07-19 21:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-19 21:58 [gcc/devel/rust/master] Merge #1397 Thomas Schwinge

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).