From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id B4F3B384641B; Thu, 27 Oct 2022 18:55:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4F3B384641B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666896945; bh=fwWdVq4k6yDZtFl9o5UK01jPH3IZ/TbyQXxEviSkv0s=; h=From:To:Subject:Date:From; b=ZA4PscNI8KCjA2UUFH6kNbji+hKRvcW70qprrWbewBrZvVvApJflRtaQOyAa8ME/5 0DHHbO9aLsjy2sHq9U6pXk18jRnWo54K7DfbTUKnnZFEz1e+Wy93qt8z04zVMHIHvA YiuzdeA+IRQGiuwsqLem8IK8Gy+mexTxUYFpsH00= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] lex: Remove system includes X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: c5454530ec4fe8b3c5f2f08191aece5544dec2d2 X-Git-Newrev: 5206aede5326ebd327d7f32c46faacbc6d07942e Message-Id: <20221027185545.B4F3B384641B@sourceware.org> Date: Thu, 27 Oct 2022 18:55:45 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5206aede5326ebd327d7f32c46faacbc6d07942e commit 5206aede5326ebd327d7f32c46faacbc6d07942e Author: Arthur Cohen Date: Wed Oct 5 09:28:02 2022 +0200 lex: Remove system includes Diff: --- gcc/rust/lex/rust-lex.cc | 5 ++--- gcc/rust/lex/rust-token.cc | 3 +-- gcc/rust/lex/rust-token.h | 7 +------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gcc/rust/lex/rust-lex.cc b/gcc/rust/lex/rust-lex.cc index 70e6b50209f..82949f5fe5f 100644 --- a/gcc/rust/lex/rust-lex.cc +++ b/gcc/rust/lex/rust-lex.cc @@ -16,10 +16,9 @@ // along with GCC; see the file COPYING3. If not see // . +#include "rust-system.h" #include "rust-lex.h" - -#include "rust-system.h" // for rust_assert and rust_unreachable -#include "rust-diagnostics.h" // for rust_error_at +#include "rust-diagnostics.h" #include "rust-linemap.h" #include "rust-session-manager.h" #include "safe-ctype.h" diff --git a/gcc/rust/lex/rust-token.cc b/gcc/rust/lex/rust-token.cc index 68313c20b1c..6aef8cc1c67 100644 --- a/gcc/rust/lex/rust-token.cc +++ b/gcc/rust/lex/rust-token.cc @@ -17,8 +17,7 @@ // . #include "rust-token.h" - -#include "rust-diagnostics.h" // for error_at +#include "rust-diagnostics.h" namespace Rust { // Hackily defined way to get token description for enum value using x-macros diff --git a/gcc/rust/lex/rust-token.h b/gcc/rust/lex/rust-token.h index 3fa46a2cebe..8f5be33a804 100644 --- a/gcc/rust/lex/rust-token.h +++ b/gcc/rust/lex/rust-token.h @@ -19,15 +19,10 @@ #ifndef RUST_TOKEN_H #define RUST_TOKEN_H +#include "rust-system.h" #include "rust-linemap.h" #include "rust-codepoint.h" -// order: config, system, coretypes, input -#include "config.h" -#include "system.h" -#include "coretypes.h" -#include "input.h" - namespace Rust { // "Primitive core types" in Rust - the different int and float types, as well // as some others