From c1ff8a96f6c11052e54919f786eb7cd4b3788f4c Mon Sep 17 00:00:00 2001
From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Tue, 4 Oct 2022 18:15:37 +0200
Subject: lexer: Remove system includes

---
 gcc/rust/lex/rust-codepoint.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc/rust/lex')

diff --git a/gcc/rust/lex/rust-codepoint.h b/gcc/rust/lex/rust-codepoint.h
index 22da080..1a9f0ca 100644
--- a/gcc/rust/lex/rust-codepoint.h
+++ b/gcc/rust/lex/rust-codepoint.h
@@ -19,7 +19,7 @@
 #ifndef RUST_CODEPOINT_H
 #define RUST_CODEPOINT_H
 
-#include <string>
+#include "rust-system.h"
 
 namespace Rust {
 struct Codepoint
-- 
cgit v1.1


From 5206aede5326ebd327d7f32c46faacbc6d07942e Mon Sep 17 00:00:00 2001
From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Wed, 5 Oct 2022 09:28:02 +0200
Subject: lex: Remove system includes

---
 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(-)

(limited to 'gcc/rust/lex')

diff --git a/gcc/rust/lex/rust-lex.cc b/gcc/rust/lex/rust-lex.cc
index 70e6b50..82949f5 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
 // <http://www.gnu.org/licenses/>.
 
+#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 68313c2..6aef8cc 100644
--- a/gcc/rust/lex/rust-token.cc
+++ b/gcc/rust/lex/rust-token.cc
@@ -17,8 +17,7 @@
 // <http://www.gnu.org/licenses/>.
 
 #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 3fa46a2..8f5be33 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
-- 
cgit v1.1