From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (wildebeest.demon.nl [212.238.236.112]) by sourceware.org (Postfix) with ESMTPS id C02353864858 for ; Sun, 11 Jul 2021 21:39:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C02353864858 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x18.wildebeest.org [172.31.17.154]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id DB01C3022F2B; Sun, 11 Jul 2021 23:39:39 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id 025552E81097; Sun, 11 Jul 2021 23:39:33 +0200 (CEST) From: Mark Wielaard To: gcc-rust@gcc.gnu.org Cc: Mark Wielaard Subject: [PATCH] Remove HIR MacroItem and other hir macro forward declarations Date: Sun, 11 Jul 2021 23:39:12 +0200 Message-Id: <20210711213912.398458-1-mark@klomp.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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: Sun, 11 Jul 2021 21:39:43 -0000 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: } }; -// 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: }*/ }; -// Replaced with forward decls - defined in "rust-macro.h" -class MacroItem; -class MacroRulesDefinition; } // namespace HIR } // namespace Rust diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-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; -// Replaced with forward decl - defined in rust-macro.h -class MacroInvocation; } // namespace HIR } // namespace Rust 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: } }; -// 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: } }; -// 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_attribs) - : Item (std::move (mappings), std::move (outer_attribs)) - {} -}; - // Item used in trait declarations - abstract base class class TraitItem { -- 2.32.0