From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 415DA3861038 for ; Mon, 12 Jul 2021 08:12:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 415DA3861038 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x32f.google.com with SMTP id a5-20020a7bc1c50000b02901e3bbe0939bso10892500wmj.0 for ; Mon, 12 Jul 2021 01:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to; bh=q2em9x40JYPSmVB++pR2jTJNkCd2QLLWCD7DC4gIGUA=; b=eM8UArpj7kcGhR83sGjbxt5RmGe9eCT2PIQ5IyGWi3jjqVXRGNUQNInSRP7r48A/GR 849RPCQGrwH9CU02TKtZqyXM0ASdfFTQHwhA8v4W56rLQy/SeJlK9wqLXnNmpNtzeqcS MFWVOfQFb/hmmepjK36wTSUY9Nst7B/KuxffVvmsE5+3NW3vAmmQzTqggtKxU6wY3rKs m+nIBrIhV/QpJOvBdsaZloXL4bKw+Bej5u8Hs+XuZxKRPduFslL39JbiVrEG1Fatt4ng Uc6Td+VzwESTqXU85u9KfnJQFuT7Yv/wEepgVq61DB5i/V85lOTlCYGDcuIG7H7V2AM/ REqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=q2em9x40JYPSmVB++pR2jTJNkCd2QLLWCD7DC4gIGUA=; b=uHrPNWzwM3G8XHtHpi82VJIOfWxsMa2IWQi+eODwTOgbR+o4zc017Dnqbw+PezvLD0 ACf8roLt0D6kEbWjoo4ej7+XU4F3GY65HoThBITupjO7hi8ZPU4kt/llJ911JBsMY9fP /1hiT7vniDNjil2Qn1pC4f72ZJLWJpZPt9bqKIRRZTp8Pkz5Vy/lkJO9+rcqOH0k/Tlu ATTHx0BO1F68n4PtQ4bluXiPX5od+NXMuUzjru2o+rNtzPXda/WrcKhNbAzDlWC4FXH+ J2PMuz2T3cg1yv0lTPTVDUfOwpXtwwqnyCxLAPqHbWnwU8w7qH66pm86sjiYu+Fr+iO6 27dw== X-Gm-Message-State: AOAM53233zk2rEuzvBfwwXRGHocb/xyYH+ywAD4tz2iUfFJRgSF261ik W2QHob9yW3/BfrTDimBwIlIqCCyp6J42ZQ== X-Google-Smtp-Source: ABdhPJzW6z2XZUuWoKp2d0SLOfPEAZ3dgKHPr1m+YVDljGCSl+Cr0Q/Ye9thJ4dUyhJK9HUvHnq11g== X-Received: by 2002:a1c:7201:: with SMTP id n1mr13364361wmc.4.1626077570076; Mon, 12 Jul 2021 01:12:50 -0700 (PDT) Received: from [192.168.0.40] ([86.14.124.218]) by smtp.gmail.com with ESMTPSA id p15sm11384488wmq.43.2021.07.12.01.12.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Jul 2021 01:12:49 -0700 (PDT) Subject: Re: [PATCH] Remove HIR MacroItem and other hir macro forward declarations To: gcc-rust@gcc.gnu.org References: <20210711213912.398458-1-mark@klomp.org> From: Philip Herron Message-ID: <42c51794-7c28-4468-20e3-1f951897d2df@embecosm.com> Date: Mon, 12 Jul 2021 09:12:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210711213912.398458-1-mark@klomp.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Xk3daTmDeYpNAmlJqElHbitIj6kfccOtM" X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-rust@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: gcc-rust mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2021 08:12:52 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Xk3daTmDeYpNAmlJqElHbitIj6kfccOtM Content-Type: multipart/mixed; boundary="vr0jBKkTOgmqTalh386aXbTiAvFkGMfvQ"; protected-headers="v1" From: Philip Herron To: gcc-rust@gcc.gnu.org Message-ID: <42c51794-7c28-4468-20e3-1f951897d2df@embecosm.com> Subject: Re: [PATCH] Remove HIR MacroItem and other hir macro forward declarations References: <20210711213912.398458-1-mark@klomp.org> In-Reply-To: <20210711213912.398458-1-mark@klomp.org> --vr0jBKkTOgmqTalh386aXbTiAvFkGMfvQ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: en-US On 11/07/2021 22:39, Mark Wielaard wrote: > Almost all HIR Macro related trees were already removed by > https://github.com/Rust-GCC/gccrs/pull/492 > > But there was still one MacroItem class left in rust-hir.h and several > (unused) forward declarations in various other hir .h files. Remove > them all. > > Resolves: https://github.com/Rust-GCC/gccrs/issues/69 > --- > gcc/rust/hir/tree/rust-hir-expr.h | 3 --- > gcc/rust/hir/tree/rust-hir-item.h | 3 --- > gcc/rust/hir/tree/rust-hir-pattern.h | 2 -- > gcc/rust/hir/tree/rust-hir-type.h | 3 --- > gcc/rust/hir/tree/rust-hir.h | 11 ----------- > 5 files changed, 22 deletions(-) > > diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust= -hir-expr.h > index 681ccf8ad65..2b1e9380f6c 100644 > --- a/gcc/rust/hir/tree/rust-hir-expr.h > +++ b/gcc/rust/hir/tree/rust-hir-expr.h > @@ -3094,9 +3094,6 @@ protected: > } > }; > =20 > -// Forward decl - defined in rust-macro.h > -class MacroInvocation; > - > // An unsafe block HIR node > class UnsafeBlockExpr : public ExprWithBlock > { > diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust= -hir-item.h > index 10b1f6143f0..e7e110fda92 100644 > --- a/gcc/rust/hir/tree/rust-hir-item.h > +++ b/gcc/rust/hir/tree/rust-hir-item.h > @@ -3020,9 +3020,6 @@ protected: > }*/ > }; > =20 > -// Replaced with forward decls - defined in "rust-macro.h" > -class MacroItem; > -class MacroRulesDefinition; > } // namespace HIR > } // namespace Rust > =20 > diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/r= ust-hir-pattern.h > index 27cba7d6e18..ac7155d562f 100644 > --- a/gcc/rust/hir/tree/rust-hir-pattern.h > +++ b/gcc/rust/hir/tree/rust-hir-pattern.h > @@ -1152,8 +1152,6 @@ class PathPattern; > class PathInExpression; > class QualifiedPathInExpression; > =20 > -// Replaced with forward decl - defined in rust-macro.h > -class MacroInvocation; > } // namespace HIR > } // namespace Rust > =20 > diff --git a/gcc/rust/hir/tree/rust-hir-type.h b/gcc/rust/hir/tree/rust= -hir-type.h > index 42fccb59607..c4771b6db38 100644 > --- a/gcc/rust/hir/tree/rust-hir-type.h > +++ b/gcc/rust/hir/tree/rust-hir-type.h > @@ -907,9 +907,6 @@ protected: > } > }; > =20 > -// Forward decl - defined in rust-macro.h > -class MacroInvocation; > - > /* TODO: possible types > * struct type? > * "enum" (tagged union) type? > diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.= h > index 1819d17b585..7d53feb0a4e 100644 > --- a/gcc/rust/hir/tree/rust-hir.h > +++ b/gcc/rust/hir/tree/rust-hir.h > @@ -613,17 +613,6 @@ protected: > } > }; > =20 > -// A macro item HIR node - potentially abstract base class > -class MacroItem : public Item > -{ > - /*public: > - std::string as_string() const;*/ > -protected: > - MacroItem (Analysis::NodeMapping mappings, AST::AttrVec outer_attrib= s) > - : Item (std::move (mappings), std::move (outer_attribs)) > - {} > -}; > - > // Item used in trait declarations - abstract base class > class TraitItem > { Hi Mark, Thanks for this, I missed these tree's in my last cleanup. This is currently being merged: https://github.com/Rust-GCC/gccrs/pull/560 Thanks --Phil --vr0jBKkTOgmqTalh386aXbTiAvFkGMfvQ-- --Xk3daTmDeYpNAmlJqElHbitIj6kfccOtM Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsD5BAABCAAjFiEET83ATZOayqRjyL0Cr7gxHEFOdpkFAmDr+YAFAwAAAAAACgkQr7gxHEFOdpkV Pgv/bj2/kjSx8GB7b056uF7jP3WNXXE2P6lTBFVeRoFjBBDyGVuFCZheJ5yhorXt/s9kMaKyBwsE y74CoU/ddwGw/lSmGhCiW58QHrmT/uUblStM6J6mPUqNcVGL/sBp8ezrQWcTjYesYTs8FjYC6uuF Q9fa186nCGvLYkN+uMWuvtiAE6e5ySZkjtz8bGo6oAsD7T2aQ7i2CVQtod1hRnqCWVhdxoBkG+J0 IqBUQoaRd8LabciuJicVJsvfC/TXVswqtUjZmCi85zyQc6jPB6ogj6t2tbkCCYzximBnCHPSvkpS t8CH/3cSMoZFbuVLlp9RgjZJaVnla1aa4ecP3UP5sxKDdpm3FsFSgbeq1evcROK6EarGHupj46Nc CkbKot+3E9zQ9RAVL32LvdIqayHIuwtQ20cYWsrHevpMkHSrg+S/sdt1xj6sBdM2BuxdROlIsn2v eGHX+ah03Y34FE/BK+2aKhDmZMYilig98zymUml9gt9pICbIA+O3fs3KwgE2 =dJmE -----END PGP SIGNATURE----- --Xk3daTmDeYpNAmlJqElHbitIj6kfccOtM--