From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id E09273858421; Sat, 15 Oct 2022 09:16:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E09273858421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665825393; bh=SclCk720QoCPeKWK/5kbo7lYbHkQX9vd9Egdw+kX7ak=; h=From:To:Subject:Date:From; b=oG9cx9+sOhVCWIGWIO+arJmG+gKgUpCU5TFaqBOuLawTeUbKb5eMTK41A1ckd+VXF rpRmTgj1gGACOHacW2IgfMXC4k53KHGMYJHos7jDhV9x6ATAWWhWoD4wnVA24MBzaw A6PvU/WjX9Vph53hlyJuZM+7pOKfVuzXffd6ibpI= 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 #1548 #1593 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: cba464b9e08c306d4c54609bf5b15eb5e0b23324 X-Git-Newrev: 3922772f5f2e5ab245342defca6b53e1563de881 Message-Id: <20221015091633.E09273858421@sourceware.org> Date: Sat, 15 Oct 2022 09:16:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:3922772f5f2e5ab245342defca6b53e1563de881 commit 3922772f5f2e5ab245342defca6b53e1563de881 Merge: cba464b9e08 25d243dd18a 95be10245b0 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Oct 14 16:19:29 2022 +0000 Merge #1548 #1593 1548: Dump module items r=CohenArthur a=CohenArthur 1593: ast: dump TypeAlias r=CohenArthur a=jdupak Implements ast dump for TypeAlias Co-authored-by: Arthur Cohen Co-authored-by: Jakub Dupak Diff: gcc/rust/ast/rust-ast-dump.cc | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --cc gcc/rust/ast/rust-ast-dump.cc index 8caad987538,d4eb5166beb,3a3c48a455e..1e7a235932d --- a/gcc/rust/ast/rust-ast-dump.cc +++ b/gcc/rust/ast/rust-ast-dump.cc @@@@ -835,8 -725,9 -709,7 +851,8 @@@@ voi Dump::visit (Function &function) { emit_visibility (function.get_visibility ()); - stream << "fn " << function.get_function_name (); + + stream << "fn " << function.get_function_name (); - if (function.has_generics ()) emit_generic_params (function.get_generic_params ());