gccrs: Cleanup unused headers

gcc/rust/ChangeLog:

	* hir/rust-ast-lower-implitem.h (RUST_AST_LOWER_IMPLITEM_H): cleanup header usage
	* hir/rust-ast-lower-item.cc: likewise
	* hir/rust-ast-lower-item.h (RUST_AST_LOWER_ITEM): likewise
	* hir/rust-ast-lower-stmt.cc: likewise
	* hir/rust-ast-lower-stmt.h (RUST_AST_LOWER_STMT): likewise
	* hir/rust-ast-lower-type.h: likewise
	* hir/rust-ast-lower.cc: likewise
	* hir/rust-ast-lower.h: likewise
	* resolve/rust-ast-resolve-expr.h: likewise
	* resolve/rust-ast-resolve-item.cc: likewise
	* resolve/rust-ast-resolve-item.h: likewise
	* resolve/rust-ast-resolve-stmt.cc: likewise
	* resolve/rust-ast-resolve-stmt.h: likewise
	* resolve/rust-ast-resolve-struct-expr-field.h: likewise
	* resolve/rust-ast-resolve-toplevel.h: likewise
	* resolve/rust-ast-resolve-type.h: likewise
	* resolve/rust-ast-resolve.h: likewise

Signed-off-by: Philip Herron <herron.philip@googlemail.com>

diff --git a/gcc/rust/hir/rust-ast-lower-implitem.h b/gcc/rust/hir/rust-ast-lower-implitem.h
index 709bb5730463f1afc989e8997bb7759b5817b647..2990e3efe731de4e1cf08024edbe8f5034268a1d 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-implitem.h
+++ b/gcc/rust/hir/rust-ast-lower-implitem.h
@@ -19,9 +19,7 @@
 #ifndef RUST_AST_LOWER_IMPLITEM_H
 #define RUST_AST_LOWER_IMPLITEM_H
 
-#include "rust-diagnostics.h"
 #include "rust-ast-lower-type.h"
-#include "rust-ast-lower-stmt.h"
 #include "rust-ast-lower-expr.h"
 #include "rust-ast-lower-pattern.h"
 #include "rust-ast-lower-block.h"

diff --git a/gcc/rust/hir/rust-ast-lower-item.cc b/gcc/rust/hir/rust-ast-lower-item.cc
index 8c265e7f31c259080a001dbf2216ca775dd251b5..0ad4a84a2c1ebfa39a3e79ba1e9674d1770b0379 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-item.cc
+++ b/gcc/rust/hir/rust-ast-lower-item.cc
@@ -17,6 +17,15 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-ast-lower-item.h"
+#include "rust-diagnostics.h"
+#include "rust-ast-lower.h"
+#include "rust-ast-lower-base.h"
+#include "rust-ast-lower-enumitem.h"
+#include "rust-ast-lower-type.h"
+#include "rust-ast-lower-implitem.h"
+#include "rust-ast-lower-expr.h"
+#include "rust-ast-lower-pattern.h"
+#include "rust-ast-lower-block.h"
 
 namespace Rust {
 namespace HIR {

diff --git a/gcc/rust/hir/rust-ast-lower-item.h b/gcc/rust/hir/rust-ast-lower-item.h
index f059c0568a7e927bc785188d3e68fe9d8b82f10a..15619c003f8e6a6ab483c2f8b8c7455573e7d82d 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-item.h
+++ b/gcc/rust/hir/rust-ast-lower-item.h
@@ -19,19 +19,7 @@
 #ifndef RUST_AST_LOWER_ITEM
 #define RUST_AST_LOWER_ITEM
 
-#include "rust-diagnostics.h"
-
-#include "rust-ast-lower.h"
 #include "rust-ast-lower-base.h"
-#include "rust-ast-lower-enumitem.h"
-#include "rust-ast-lower-type.h"
-#include "rust-ast-lower-implitem.h"
-#include "rust-ast-lower-stmt.h"
-#include "rust-ast-lower-expr.h"
-#include "rust-ast-lower-pattern.h"
-#include "rust-ast-lower-block.h"
-#include "rust-ast-lower-extern.h"
-#include "rust-hir-full-decls.h"
 
 namespace Rust {
 namespace HIR {

diff --git a/gcc/rust/hir/rust-ast-lower-stmt.cc b/gcc/rust/hir/rust-ast-lower-stmt.cc
index 3d94259ac5aa124187e23a50a4479136b8241740..dbff8ad715f32ef0a190404123661a6a92e3eebb 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-stmt.cc
+++ b/gcc/rust/hir/rust-ast-lower-stmt.cc
@@ -17,6 +17,11 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-ast-lower-stmt.h"
+#include "rust-ast-lower-enumitem.h"
+#include "rust-ast-lower-type.h"
+#include "rust-ast-lower-block.h"
+#include "rust-ast-lower-expr.h"
+#include "rust-ast-lower-pattern.h"
 
 namespace Rust {
 namespace HIR {

diff --git a/gcc/rust/hir/rust-ast-lower-stmt.h b/gcc/rust/hir/rust-ast-lower-stmt.h
index de4725be177a79f9321f9d7a0ab139830c1e9b30..8365b32b822221640a7ee9b45b34e4f153b7512d 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-stmt.h
+++ b/gcc/rust/hir/rust-ast-lower-stmt.h
@@ -19,14 +19,7 @@
 #ifndef RUST_AST_LOWER_STMT
 #define RUST_AST_LOWER_STMT
 
-#include "rust-diagnostics.h"
-
 #include "rust-ast-lower-base.h"
-#include "rust-ast-lower-enumitem.h"
-#include "rust-ast-lower-type.h"
-#include "rust-ast-lower-block.h"
-#include "rust-ast-lower-expr.h"
-#include "rust-ast-lower-pattern.h"
 
 namespace Rust {
 namespace HIR {

diff --git a/gcc/rust/hir/rust-ast-lower-type.h b/gcc/rust/hir/rust-ast-lower-type.h
index a0761023ce80fa7d5239edf5a9942c027c96eeac..7432ed80d603db0aeb367578ac83d1e8f18f3449 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-type.h
+++ b/gcc/rust/hir/rust-ast-lower-type.h
@@ -20,7 +20,6 @@
 #define RUST_AST_LOWER_TYPE
 
 #include "rust-ast-lower-base.h"
-#include "rust-diagnostics.h"
 #include "rust-ast-lower-expr.h"
 
 namespace Rust {

diff --git a/gcc/rust/hir/rust-ast-lower.cc b/gcc/rust/hir/rust-ast-lower.cc
index 36dd1a9d8e67883409da698a06a2062784e2f445..c2fd54dae9b813d5267e40bc95d45218f35a0c73 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower.cc
+++ b/gcc/rust/hir/rust-ast-lower.cc
@@ -18,7 +18,7 @@
 
 #include "rust-ast-lower.h"
 #include "rust-ast-lower-item.h"
-#include "rust-ast-lower-implitem.h"
+#include "rust-ast-lower-stmt.h"
 #include "rust-ast-lower-expr.h"
 #include "rust-ast-lower-block.h"
 #include "rust-ast-lower-type.h"

diff --git a/gcc/rust/hir/rust-ast-lower.h b/gcc/rust/hir/rust-ast-lower.h
index e52b9b899b646dcad149e37b0dd59e2d7ddedff8..c56d449e0d4120e682acd5acc4f0854ec9550729 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower.h
+++ b/gcc/rust/hir/rust-ast-lower.h
@@ -20,9 +20,8 @@
 #define RUST_HIR_LOWER
 
 #include "rust-system.h"
-#include "rust-ast-full.h"
-#include "rust-ast-visitor.h"
-#include "rust-hir-full.h"
+#include "rust-ast-full-decls.h"
+#include "rust-hir-full-decls.h"
 
 namespace Rust {
 namespace HIR {

diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.h b/gcc/rust/resolve/rust-ast-resolve-expr.h
index 07b029fabb35ba6746d60d5dbb73726ed7d6f0c4..9863588ef32f0ff9e463ab10b07ffde406509320 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-expr.h
+++ b/gcc/rust/resolve/rust-ast-resolve-expr.h
@@ -21,7 +21,6 @@
 
 #include "rust-ast-resolve-base.h"
 #include "rust-ast-resolve-pattern.h"
-#include "rust-ast-full.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc b/gcc/rust/resolve/rust-ast-resolve-item.cc
index 958ae49c810442ee93d9e7265123675a1f638296..385d4b0566a8514693d08d416a479c06a31cbded 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-item.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-item.cc
@@ -17,7 +17,11 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-ast-resolve-item.h"
+#include "rust-ast-resolve-toplevel.h"
+#include "rust-ast-resolve-type.h"
+#include "rust-ast-resolve-pattern.h"
 #include "rust-ast-resolve-path.h"
+
 #include "selftest.h"
 
 namespace Rust {

diff --git a/gcc/rust/resolve/rust-ast-resolve-item.h b/gcc/rust/resolve/rust-ast-resolve-item.h
index d17c9561fb781f37d75e80c99278b6b21a73c6e0..db47df5713a5b9492d7089ccb0092ffd1a294e3c 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-item.h
+++ b/gcc/rust/resolve/rust-ast-resolve-item.h
@@ -21,11 +21,7 @@
 
 #include "rust-ast-full-decls.h"
 #include "rust-ast-resolve-base.h"
-#include "rust-ast-full.h"
-#include "rust-ast-resolve-toplevel.h"
-#include "rust-ast-resolve-type.h"
-#include "rust-ast-resolve-pattern.h"
-#include "rust-ast-resolve-stmt.h"
+
 #include "config.h"
 
 namespace Rust {

diff --git a/gcc/rust/resolve/rust-ast-resolve-stmt.cc b/gcc/rust/resolve/rust-ast-resolve-stmt.cc
index 00e37c2c518d4ffb69ae5e23b4a69887c0ecd1b3..2cbf6e0e579ed25c07ce4929a73a23ffcef6ee16 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-stmt.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-stmt.cc
@@ -18,6 +18,7 @@
 
 #include "rust-ast-resolve-item.h"
 #include "rust-ast-resolve-stmt.h"
+#include "rust-ast-resolve-implitem.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/resolve/rust-ast-resolve-stmt.h b/gcc/rust/resolve/rust-ast-resolve-stmt.h
index 1336402d43ec8c0310a8f3428a4693fdeee7df13..39864c3ba4d13293d0851bd3b6fc7a6d7bb38e6b 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-stmt.h
+++ b/gcc/rust/resolve/rust-ast-resolve-stmt.h
@@ -20,7 +20,6 @@
 #define RUST_AST_RESOLVE_STMT_H
 
 #include "rust-ast-resolve-base.h"
-#include "rust-ast-full.h"
 #include "rust-ast-resolve-type.h"
 #include "rust-ast-resolve-pattern.h"
 #include "rust-ast-resolve-expr.h"

diff --git a/gcc/rust/resolve/rust-ast-resolve-struct-expr-field.h b/gcc/rust/resolve/rust-ast-resolve-struct-expr-field.h
index a0e7d19def53cfc66b74ec93f52ac078693b8650..6a11e2474d2956b3ac37f774305937ed02a50c4f 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-struct-expr-field.h
+++ b/gcc/rust/resolve/rust-ast-resolve-struct-expr-field.h
@@ -20,7 +20,6 @@
 #define RUST_AST_RESOLVE_STRUCT_EXPR_FIELD
 
 #include "rust-ast-resolve-base.h"
-#include "rust-ast-full.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/resolve/rust-ast-resolve-toplevel.h b/gcc/rust/resolve/rust-ast-resolve-toplevel.h
index d751318ee54a344c6624de147e6fea7427592d86..c705ea860cd759d15c09f53169dab0fba2abc5c5 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-toplevel.h
+++ b/gcc/rust/resolve/rust-ast-resolve-toplevel.h
@@ -20,11 +20,8 @@
 #define RUST_AST_RESOLVE_TOPLEVEL_H
 
 #include "rust-ast-resolve-base.h"
-#include "rust-ast-resolve-type.h"
 #include "rust-ast-resolve-implitem.h"
-#include "rust-ast-full.h"
 #include "rust-name-resolver.h"
-#include "rust-session-manager.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/resolve/rust-ast-resolve-type.h b/gcc/rust/resolve/rust-ast-resolve-type.h
index bb1178362fbeb4d658563cdd7e19763e053d0149..f98ed8fee3a1e181b54caa73694ada7d00e37810 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-type.h
+++ b/gcc/rust/resolve/rust-ast-resolve-type.h
@@ -21,7 +21,6 @@
 
 #include "rust-ast-resolve-base.h"
 #include "rust-ast-resolve-expr.h"
-#include "rust-ast-full.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/resolve/rust-ast-resolve.h b/gcc/rust/resolve/rust-ast-resolve.h
index 85fe50657b384b5f72de162afaed5371d917276a..b1237234f16b06919822366cc814c8a4b0a4a6f8 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve.h
+++ b/gcc/rust/resolve/rust-ast-resolve.h
@@ -20,7 +20,6 @@
 #define RUST_AST_RESOLVE_H
 
 #include "rust-name-resolver.h"
-#include "rust-ast-full.h"
 #include "rust-hir-map.h"
 
 namespace Rust {