From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 7EC463835427; Fri, 22 Jul 2022 13:34:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7EC463835427 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 #1405 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: 4a8c733b470eb6b7b52722c8694af9395d7cffe1 X-Git-Newrev: dc9981eb31327b7564e350d3997458f567db33d7 Message-Id: <20220722133456.7EC463835427@sourceware.org> Date: Fri, 22 Jul 2022 13:34:56 +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: Fri, 22 Jul 2022 13:34:56 -0000 https://gcc.gnu.org/g:dc9981eb31327b7564e350d3997458f567db33d7 commit dc9981eb31327b7564e350d3997458f567db33d7 Merge: 4a8c733b470 d3926e6a87a Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Jul 22 09:55:16 2022 +0000 Merge #1405 1405: Allow repeating metavars alongside repetitions r=CohenArthur a=CohenArthur Fixes #1400 Co-authored-by: Arthur Cohen Diff: gcc/rust/expand/rust-macro-expand.cc | 23 +++++++--- gcc/rust/expand/rust-macro-expand.h | 61 ++++++++++++++++++------- gcc/rust/expand/rust-macro-substitute-ctx.cc | 9 ++-- gcc/testsuite/rust/compile/macro-issue1400-2.rs | 32 +++++++++++++ gcc/testsuite/rust/compile/macro-issue1400.rs | 33 +++++++++++++ 5 files changed, 133 insertions(+), 25 deletions(-)