public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/rust/master] Merge #1397
Date: Tue, 19 Jul 2022 21:58:02 +0000 (GMT)	[thread overview]
Message-ID: <20220719215802.E01EA385829A@sourceware.org> (raw)

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


                 reply	other threads:[~2022-07-19 21:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220719215802.E01EA385829A@sourceware.org \
    --to=tschwinge@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).