From: Philip Herron Date: Sun, 12 Mar 2023 18:38:08 +0000 (+0000) Subject: gccrs: cleanup header usage to decouple includes X-Git-Tag: basepoints/gcc-15~2771 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=385a03ae32dc22c1404723bfa7a5d33ec1e02e2f;p=thirdparty%2Fgcc.git gccrs: cleanup header usage to decouple includes gcc/rust/ChangeLog: * backend/rust-compile-base.cc: fix headers * backend/rust-compile-base.h: likewise * backend/rust-compile-expr.cc: likewise * backend/rust-compile-extern.h: likewise * backend/rust-compile-pattern.cc: likewise * backend/rust-compile.cc: likewise * typecheck/rust-autoderef.cc: likewise * typecheck/rust-hir-dot-operator.cc: likewise * typecheck/rust-hir-inherent-impl-overlap.h: likewise * typecheck/rust-hir-path-probe.cc: likewise * typecheck/rust-hir-trait-resolve.cc: likewise * typecheck/rust-hir-type-check-base.cc: likewise * typecheck/rust-hir-type-check-base.h (RUST_HIR_TYPE_CHECK_BASE): likewise * typecheck/rust-hir-type-check-enumitem.cc: likewise * typecheck/rust-hir-type-check-expr.cc: likewise * typecheck/rust-hir-type-check-implitem.cc: likewise * typecheck/rust-hir-type-check-item.cc: likewise * typecheck/rust-hir-type-check-path.cc: likewise * typecheck/rust-hir-type-check-pattern.cc: likewise * typecheck/rust-hir-type-check-stmt.cc: likewise * typecheck/rust-hir-type-check-struct.cc: likewise * typecheck/rust-hir-type-check-type.cc: likewise * typecheck/rust-hir-type-check-type.h: likewise * typecheck/rust-hir-type-check.h (RUST_HIR_TYPE_CHECK): likewise * typecheck/rust-tyty-bounds.cc: likewise * typecheck/rust-tyty-call.cc: likewise * typecheck/rust-tyty-subst.cc: likewise * typecheck/rust-tyty.cc: likewise Signed-off-by: Philip Herron --- diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc index 0a8b1769ea66..869f05ff28b7 100644 --- a/gcc/rust/backend/rust-compile-base.cc +++ b/gcc/rust/backend/rust-compile-base.cc @@ -18,11 +18,11 @@ #include "rust-compile-base.h" #include "rust-abi.h" -#include "rust-compile-item.h" #include "rust-compile-stmt.h" #include "rust-compile-expr.h" #include "rust-compile-fnparam.h" #include "rust-compile-var-decl.h" +#include "rust-compile-type.h" #include "rust-constexpr.h" #include "rust-diagnostics.h" #include "rust-expr.h" // for AST::AttrInputLiteral diff --git a/gcc/rust/backend/rust-compile-base.h b/gcc/rust/backend/rust-compile-base.h index ffcfe7b094ff..1bf157030be3 100644 --- a/gcc/rust/backend/rust-compile-base.h +++ b/gcc/rust/backend/rust-compile-base.h @@ -20,9 +20,6 @@ #define RUST_COMPILE_BASE #include "rust-compile-context.h" -#include "rust-compile-type.h" -#include "rust-hir-visitor.h" -#include "rust-hir-full.h" namespace Rust { namespace Compile { diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc index 3d47d434e5c3..8a0eadc8a02e 100644 --- a/gcc/rust/backend/rust-compile-expr.cc +++ b/gcc/rust/backend/rust-compile-expr.cc @@ -18,21 +18,19 @@ #include "rust-compile-expr.h" #include "rust-compile-struct-field-expr.h" -#include "rust-hir-trait-resolve.h" #include "rust-hir-path-probe.h" -#include "rust-hir-type-bounds.h" #include "rust-compile-pattern.h" #include "rust-compile-resolve-path.h" #include "rust-compile-block.h" #include "rust-compile-implitem.h" #include "rust-constexpr.h" #include "rust-type-util.h" +#include "rust-compile-type.h" #include "rust-gcc.h" #include "fold-const.h" #include "realmpfr.h" #include "convert.h" -#include "print-tree.h" namespace Rust { namespace Compile { diff --git a/gcc/rust/backend/rust-compile-extern.h b/gcc/rust/backend/rust-compile-extern.h index ec3316567e12..30360df9ea01 100644 --- a/gcc/rust/backend/rust-compile-extern.h +++ b/gcc/rust/backend/rust-compile-extern.h @@ -21,6 +21,7 @@ #include "rust-compile-base.h" #include "rust-compile-intrinsic.h" +#include "rust-compile-type.h" namespace Rust { namespace Compile { diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc index 20a550d2a02c..a96b1b9b1f35 100644 --- a/gcc/rust/backend/rust-compile-pattern.cc +++ b/gcc/rust/backend/rust-compile-pattern.cc @@ -20,6 +20,7 @@ #include "rust-compile-expr.h" #include "rust-compile-resolve-path.h" #include "rust-constexpr.h" +#include "rust-compile-type.h" namespace Rust { namespace Compile { diff --git a/gcc/rust/backend/rust-compile.cc b/gcc/rust/backend/rust-compile.cc index 96c7458fe760..a081265fc978 100644 --- a/gcc/rust/backend/rust-compile.cc +++ b/gcc/rust/backend/rust-compile.cc @@ -19,14 +19,8 @@ #include "rust-compile.h" #include "rust-compile-item.h" #include "rust-compile-implitem.h" -#include "rust-compile-expr.h" -#include "rust-compile-struct-field-expr.h" -#include "rust-compile-stmt.h" -#include "rust-hir-trait-resolve.h" -#include "rust-hir-path-probe.h" #include "rust-hir-type-bounds.h" -#include "rust-hir-dot-operator.h" -#include "rust-compile-block.h" +#include "rust-compile-type.h" namespace Rust { namespace Compile { diff --git a/gcc/rust/typecheck/rust-autoderef.cc b/gcc/rust/typecheck/rust-autoderef.cc index b85be70a89d4..d4a21ce1a262 100644 --- a/gcc/rust/typecheck/rust-autoderef.cc +++ b/gcc/rust/typecheck/rust-autoderef.cc @@ -20,6 +20,7 @@ #include "rust-hir-path-probe.h" #include "rust-hir-dot-operator.h" #include "rust-hir-trait-resolve.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-dot-operator.cc b/gcc/rust/typecheck/rust-hir-dot-operator.cc index 005f146ad250..67ff4ad43c64 100644 --- a/gcc/rust/typecheck/rust-hir-dot-operator.cc +++ b/gcc/rust/typecheck/rust-hir-dot-operator.cc @@ -20,6 +20,7 @@ #include "rust-hir-path-probe.h" #include "rust-hir-trait-resolve.h" #include "rust-hir-type-check-item.h" +#include "rust-type-util.h" #include "rust-coercion.h" namespace Rust { diff --git a/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h b/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h index cf89a91a633e..c6db896bb4fe 100644 --- a/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h +++ b/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h @@ -20,7 +20,7 @@ #define RUST_HIR_INHERENT_IMPL_ITEM_OVERLAP_H #include "rust-hir-type-check-base.h" -#include "rust-hir-full.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-path-probe.cc b/gcc/rust/typecheck/rust-hir-path-probe.cc index 8d2cf584edf8..049c91e97b39 100644 --- a/gcc/rust/typecheck/rust-hir-path-probe.cc +++ b/gcc/rust/typecheck/rust-hir-path-probe.cc @@ -17,8 +17,8 @@ // . #include "rust-hir-path-probe.h" -#include "rust-hir-type-check-item.h" #include "rust-hir-trait-resolve.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.cc b/gcc/rust/typecheck/rust-hir-trait-resolve.cc index 92faa8c0cf85..767e56c5929a 100644 --- a/gcc/rust/typecheck/rust-hir-trait-resolve.cc +++ b/gcc/rust/typecheck/rust-hir-trait-resolve.cc @@ -18,6 +18,8 @@ #include "rust-hir-trait-resolve.h" #include "rust-hir-type-check-expr.h" +#include "rust-substitution-mapper.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-base.cc b/gcc/rust/typecheck/rust-hir-type-check-base.cc index 6bacb81d6ed9..4d53526fdc93 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-base.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-base.cc @@ -18,9 +18,8 @@ #include "rust-hir-type-check-base.h" #include "rust-hir-type-check-expr.h" -#include "rust-hir-type-check-implitem.h" -#include "rust-hir-type-check-item.h" #include "rust-hir-type-check-type.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-base.h b/gcc/rust/typecheck/rust-hir-type-check-base.h index 7afe6cd4859d..5b654b616aa8 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-base.h +++ b/gcc/rust/typecheck/rust-hir-type-check-base.h @@ -19,10 +19,8 @@ #ifndef RUST_HIR_TYPE_CHECK_BASE #define RUST_HIR_TYPE_CHECK_BASE -#include "rust-diagnostics.h" #include "rust-hir-map.h" #include "rust-hir-type-check.h" -#include "rust-hir-visitor.h" #include "rust-name-resolver.h" namespace Rust { diff --git a/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc b/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc index 6cb080f0a650..bb02181c6553 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc @@ -16,10 +16,10 @@ // along with GCC; see the file COPYING3. If not see // . -#include "rust-hir-full.h" #include "rust-hir-type-check-type.h" #include "rust-hir-type-check-expr.h" #include "rust-hir-type-check-enumitem.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc index 6ffed66c25f3..fc85c0102d8a 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc @@ -16,17 +16,16 @@ // along with GCC; see the file COPYING3. If not see // . -#include "rust-hir-full.h" #include "rust-tyty-call.h" #include "rust-hir-type-check-struct-field.h" #include "rust-hir-path-probe.h" #include "rust-substitution-mapper.h" #include "rust-hir-trait-resolve.h" -#include "rust-hir-type-bounds.h" #include "rust-hir-dot-operator.h" #include "rust-hir-type-check-pattern.h" #include "rust-hir-type-check-expr.h" #include "rust-hir-type-check-stmt.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-implitem.cc b/gcc/rust/typecheck/rust-hir-type-check-implitem.cc index c0833a429920..b42b034d7dfe 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-implitem.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-implitem.cc @@ -18,10 +18,10 @@ #include "rust-hir-type-check-implitem.h" #include "rust-hir-type-check-base.h" -#include "rust-hir-full.h" #include "rust-hir-type-check-type.h" #include "rust-hir-type-check-expr.h" #include "rust-hir-type-check-pattern.h" +#include "rust-type-util.h" #include "rust-tyty.h" namespace Rust { diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.cc b/gcc/rust/typecheck/rust-hir-type-check-item.cc index 9b5a19a00bcf..571e86c73692 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-item.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-item.cc @@ -16,15 +16,15 @@ // along with GCC; see the file COPYING3. If not see // . -#include "rust-hir-full.h" #include "rust-hir-type-check-item.h" #include "rust-hir-type-check-enumitem.h" #include "rust-hir-type-check-implitem.h" #include "rust-hir-type-check-type.h" -#include "rust-hir-type-check-stmt.h" #include "rust-hir-type-check-expr.h" #include "rust-hir-type-check-pattern.h" #include "rust-hir-trait-resolve.h" +#include "rust-substitution-mapper.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-path.cc b/gcc/rust/typecheck/rust-hir-type-check-path.cc index ef77c5dbc4f1..c56c1dc8d3de 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-path.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-path.cc @@ -19,6 +19,9 @@ #include "rust-hir-type-check-expr.h" #include "rust-hir-type-check-type.h" #include "rust-hir-trait-resolve.h" +#include "rust-substitution-mapper.h" +#include "rust-hir-path-probe.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc index c2c39c962277..5a606956804f 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc @@ -18,6 +18,7 @@ #include "rust-hir-type-check-pattern.h" #include "rust-hir-type-check-expr.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc index 316df6cf74a5..d1fb45a8dbe3 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc @@ -17,13 +17,12 @@ // . #include "rust-hir-type-check-stmt.h" -#include "rust-hir-full.h" #include "rust-hir-type-check-type.h" #include "rust-hir-type-check-expr.h" -#include "rust-hir-type-check-enumitem.h" #include "rust-hir-type-check-implitem.h" #include "rust-hir-type-check-item.h" #include "rust-hir-type-check-pattern.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-struct.cc b/gcc/rust/typecheck/rust-hir-type-check-struct.cc index b6ccabc2a257..ca0433484311 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-struct.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-struct.cc @@ -17,9 +17,9 @@ // . #include "rust-hir-type-check.h" -#include "rust-hir-full.h" #include "rust-hir-type-check-expr.h" #include "rust-hir-type-check-struct-field.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.cc b/gcc/rust/typecheck/rust-hir-type-check-type.cc index 4da3aa0dd044..50a39fdf308e 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-type.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-type.cc @@ -19,6 +19,10 @@ #include "rust-hir-type-check-type.h" #include "rust-hir-trait-resolve.h" #include "rust-hir-type-check-expr.h" +#include "rust-hir-path-probe.h" +#include "rust-hir-type-bounds.h" +#include "rust-substitution-mapper.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.h b/gcc/rust/typecheck/rust-hir-type-check-type.h index 37579312c9a3..2eeb12b12833 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-type.h +++ b/gcc/rust/typecheck/rust-hir-type-check-type.h @@ -20,9 +20,6 @@ #define RUST_HIR_TYPE_CHECK_TYPE #include "rust-hir-type-check-base.h" -#include "rust-hir-full.h" -#include "rust-substitution-mapper.h" -#include "rust-hir-path-probe.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h index 2cd58988a75f..427c56be29f3 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.h +++ b/gcc/rust/typecheck/rust-hir-type-check.h @@ -19,8 +19,6 @@ #ifndef RUST_HIR_TYPE_CHECK #define RUST_HIR_TYPE_CHECK -#include "rust-type-util.h" -#include "rust-hir-full-decls.h" #include "rust-hir-map.h" #include "rust-tyty.h" #include "rust-hir-trait-reference.h" diff --git a/gcc/rust/typecheck/rust-tyty-bounds.cc b/gcc/rust/typecheck/rust-tyty-bounds.cc index 5d25805f181b..6c36303baca5 100644 --- a/gcc/rust/typecheck/rust-tyty-bounds.cc +++ b/gcc/rust/typecheck/rust-tyty-bounds.cc @@ -18,7 +18,8 @@ #include "rust-hir-type-bounds.h" #include "rust-hir-trait-resolve.h" -#include "rust-hir-type-check-item.h" +#include "rust-substitution-mapper.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { diff --git a/gcc/rust/typecheck/rust-tyty-call.cc b/gcc/rust/typecheck/rust-tyty-call.cc index 156ed9820549..0f04d149fc84 100644 --- a/gcc/rust/typecheck/rust-tyty-call.cc +++ b/gcc/rust/typecheck/rust-tyty-call.cc @@ -18,6 +18,7 @@ #include "rust-tyty-call.h" #include "rust-hir-type-check-expr.h" +#include "rust-type-util.h" namespace Rust { namespace TyTy { diff --git a/gcc/rust/typecheck/rust-tyty-subst.cc b/gcc/rust/typecheck/rust-tyty-subst.cc index 5ff76411ab91..dd533d7b9a7c 100644 --- a/gcc/rust/typecheck/rust-tyty-subst.cc +++ b/gcc/rust/typecheck/rust-tyty-subst.cc @@ -17,11 +17,11 @@ // . #include "rust-tyty-subst.h" -#include "rust-hir-full.h" #include "rust-tyty.h" #include "rust-hir-type-check.h" #include "rust-substitution-mapper.h" #include "rust-hir-type-check-type.h" +#include "rust-hir-type-bounds.h" namespace Rust { namespace TyTy { diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index 508940e5480c..8c542c5eb80e 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -27,6 +27,8 @@ #include "rust-hir-trait-reference.h" #include "rust-hir-trait-resolve.h" #include "rust-tyty-cmp.h" +#include "rust-type-util.h" +#include "rust-hir-type-bounds.h" #include "options.h"