From: Philip Herron Date: Mon, 20 Mar 2023 14:39:44 +0000 (+0000) Subject: gccrs: Cleanup unused headers X-Git-Tag: basepoints/gcc-15~2755 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5130c17766bddac0ca8d60a92151b2817aa32ae1;p=thirdparty%2Fgcc.git 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 --- diff --git a/gcc/rust/hir/rust-ast-lower-implitem.h b/gcc/rust/hir/rust-ast-lower-implitem.h index afa1d9333417..7475e8784500 100644 --- 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 7b48549ddddc..b3eca5298291 100644 --- a/gcc/rust/hir/rust-ast-lower-item.cc +++ b/gcc/rust/hir/rust-ast-lower-item.cc @@ -17,6 +17,15 @@ // . #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 06a9627771b5..24f7ba622a58 100644 --- 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 3d94259ac5aa..dbff8ad715f3 100644 --- a/gcc/rust/hir/rust-ast-lower-stmt.cc +++ b/gcc/rust/hir/rust-ast-lower-stmt.cc @@ -17,6 +17,11 @@ // . #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 2bb3513abe03..5cc177050750 100644 --- 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 296733b81b4f..5b17d8b616d5 100644 --- 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 e3e6a21863a0..e74b8bef2d82 100644 --- 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 11848546d792..23730e00221c 100644 --- 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 b3d9e0d799c6..68b8462d37bd 100644 --- 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 d1ed21032307..4f3b924a5868 100644 --- a/gcc/rust/resolve/rust-ast-resolve-item.cc +++ b/gcc/rust/resolve/rust-ast-resolve-item.cc @@ -17,7 +17,11 @@ // . #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 8db3eb35760f..1246ad99f1c8 100644 --- 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 84970f6108f1..01e848424bf0 100644 --- 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 184ea3a64df0..bec5805c36fd 100644 --- 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 603a411a457d..67bb95593728 100644 --- 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 5109d8f67754..9e2fb5764815 100644 --- 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 04080d65972e..fd8307b8cd6b 100644 --- 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 aac357e49ec5..b2dbcba2adee 100644 --- 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 {