From 6bbf7202c6d4ab6a6b8c03e1871099af3f8e0ea5 Mon Sep 17 00:00:00 2001
From: Philip Herron <herron.philip@googlemail.com>
Date: Sun, 12 Mar 2023 18:38:08 +0000
Subject: 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 <herron.philip@googlemail.com>
---
 gcc/rust/backend/rust-compile-base.cc    | 2 +-
 gcc/rust/backend/rust-compile-base.h     | 3 ---
 gcc/rust/backend/rust-compile-expr.cc    | 4 +---
 gcc/rust/backend/rust-compile-extern.h   | 1 +
 gcc/rust/backend/rust-compile-pattern.cc | 1 +
 gcc/rust/backend/rust-compile.cc         | 8 +-------
 6 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'gcc/rust/backend')

diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc
index c108661..80c2391 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 a8f8f2d..281761e 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 b2a8fab..34f1021 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 b42878e..a3c4715 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 8e59548..1a39208 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 3217901..a01662c 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 {
-- 
cgit v1.1