From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 32CB6385843D; Tue, 27 Sep 2022 08:23:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32CB6385843D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664267017; bh=zCbNJ0E/9fbWu9dpggHEj01PqlpbSEVqhqX28ct2iH4=; h=From:To:Subject:Date:From; b=RGWcBUH0rOJoJ6uicI3r7+mD9o1YpUc49+DHLLxihSydOUrk5qMTPVo5r9+TcAt0O gS8mwpPBYwQaBvXq0sKxkqWxFH2JBTsOFYXidKCE3PYyvgNkUIlnGMM9Eub5lV3A8/ LT457/OUoGwN0kCOWnt2ClyGlpl0lI87MoHib3BI= 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 #1521 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: 8ed1bbaa40527c561b25b5dadb963ca404f2da37 X-Git-Newrev: cecd314884a285957a110560bbd141a5f39ad7d3 Message-Id: <20220927082337.32CB6385843D@sourceware.org> Date: Tue, 27 Sep 2022 08:23:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cecd314884a285957a110560bbd141a5f39ad7d3 commit cecd314884a285957a110560bbd141a5f39ad7d3 Merge: 8ed1bbaa405 1c19256b706 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Sep 27 05:26:17 2022 +0000 Merge #1521 1521: expand: eager evaluate macros inside builtin macros r=CohenArthur a=liushuyu - expand: eagerly evaluate the macros inside some of the builtin macros Co-authored-by: liushuyu Diff: gcc/rust/ast/rust-ast.h | 12 ++ gcc/rust/ast/rust-expr.h | 2 + gcc/rust/expand/rust-macro-builtins.cc | 206 ++++++++++++++++----- gcc/rust/expand/rust-macro-expand.cc | 1 + gcc/testsuite/rust/compile/builtin_macro_concat.rs | 8 +- gcc/testsuite/rust/compile/builtin_macro_env.rs | 4 +- .../rust/compile/builtin_macro_recurse.rs | 21 +++ 7 files changed, 203 insertions(+), 51 deletions(-)