gccrs: borrowck: Use rust-system.h

Replace direct usage of system headers.

gcc/rust/ChangeLog:

	* checks/errors/borrowck/rust-bir-dump.cc: Use rust-system.h
	* checks/errors/borrowck/rust-bir-dump.h (RUST_BIR_DUMP_H): Use rust-system.h
	* checks/errors/borrowck/rust-bir-place.h (RUST_BIR_PLACE_H): Use rust-system.h
	* checks/errors/borrowck/rust-function-collector.h: Use rust-system.h
	* rust-system.h: Use rust-system.h
	* typecheck/rust-hir-type-check.h: Use rust-system.h
	* typecheck/rust-tyty-subst.cc: Use rust-system.h
	* typecheck/rust-tyty-subst.h: Use rust-system.h
	* typecheck/rust-tyty.h: Use rust-system.h

Signed-off-by: Jakub Dupak <dev@jakubdupak.com>

diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc b/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc
index 23aa7c6b078b9b5003d08766cd2cd03c9a934875..3e49bc76933556c7944c68d3abe9fc2c7bb6ff81 100644 (file)
--- a/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc
+++ b/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc
@@ -1,4 +1,4 @@
-#include <numeric>
+#include "rust-system.h"
 #include "rust-bir-dump.h"
 #include "rust-diagnostics.h"
 

diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-dump.h b/gcc/rust/checks/errors/borrowck/rust-bir-dump.h
index e8cf13726022f52784895936a77552636799d2c5..b6407a8528a06a4c1242d2b7821c3c5050be4072 100644 (file)
--- a/gcc/rust/checks/errors/borrowck/rust-bir-dump.h
+++ b/gcc/rust/checks/errors/borrowck/rust-bir-dump.h
@@ -19,8 +19,7 @@
 #ifndef RUST_BIR_DUMP_H
 #define RUST_BIR_DUMP_H
 
-#include <ostream>
-#include <utility>
+#include "rust-system.h"
 #include "rust-bir-place.h"
 #include "rust-bir-visitor.h"
 #include "rust-bir.h"

diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-place.h b/gcc/rust/checks/errors/borrowck/rust-bir-place.h
index 7b04ae4082429de74dd2df16757fd380f7993bb5..ccc820121cc4c85cfeb2aea3a9bdb016f532d35f 100644 (file)
--- a/gcc/rust/checks/errors/borrowck/rust-bir-place.h
+++ b/gcc/rust/checks/errors/borrowck/rust-bir-place.h
@@ -19,7 +19,6 @@
 #ifndef RUST_BIR_PLACE_H
 #define RUST_BIR_PLACE_H
 
-#include <limits>
 #include "rust-mapping-common.h"
 #include "rust-system.h"
 #include "rust-tyty.h"

diff --git a/gcc/rust/checks/errors/borrowck/rust-function-collector.h b/gcc/rust/checks/errors/borrowck/rust-function-collector.h
index 18f2f5e11d1f47b05d246cb74aa55413d35d5114..272f20d5f9356443cbf72a0237a229a26e47ccaf 100644 (file)
--- a/gcc/rust/checks/errors/borrowck/rust-function-collector.h
+++ b/gcc/rust/checks/errors/borrowck/rust-function-collector.h
@@ -22,8 +22,7 @@
 #include "rust-hir-item.h"
 #include "rust-hir-visitor.h"
 #include "rust-hir.h"
-
-#include <vector>
+#include "rust-system.h"
 
 namespace Rust {
 

diff --git a/gcc/rust/rust-system.h b/gcc/rust/rust-system.h
index d8a421817000df1064a2412fa6d0aff40248a0a7..2382e5b1fb4e28eae5c5b067fefdd6102d836991 100644 (file)
--- a/gcc/rust/rust-system.h
+++ b/gcc/rust/rust-system.h
@@ -36,6 +36,7 @@
 #include <map>
 #include <set>
 #include <vector>
+#include <stack>
 #include <sstream>
 #include <string>
 #include <deque>
@@ -45,6 +46,8 @@
 #include <fstream>
 #include <array>
 #include <algorithm>
+#include <limits>
+#include <numeric>
 
 // Rust frontend requires C++11 minimum, so will have unordered_map and set
 #include <unordered_map>

diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h
index c32fa4e84871f91b7701db0e24a90827e20a56e6..c85a83955b9c88c152c8de036449910b17866824 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check.h
+++ b/gcc/rust/typecheck/rust-hir-type-check.h
@@ -25,8 +25,7 @@
 #include "rust-autoderef.h"
 #include "rust-tyty-region.h"
 #include "rust-tyty-variance-analysis.h"
-
-#include <stack>
+#include "rust-system.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-tyty-subst.cc b/gcc/rust/typecheck/rust-tyty-subst.cc
index 71d41d6f79603a73ec846210b231b95efd05b7ea..8c801558c423b8d261aa9cb1a764fec04c8d279c 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty-subst.cc
+++ b/gcc/rust/typecheck/rust-tyty-subst.cc
@@ -18,7 +18,7 @@
 
 #include "rust-tyty-subst.h"
 
-#include <utility>
+#include "rust-system.h"
 #include "rust-tyty.h"
 #include "rust-hir-type-check.h"
 #include "rust-substitution-mapper.h"

diff --git a/gcc/rust/typecheck/rust-tyty-subst.h b/gcc/rust/typecheck/rust-tyty-subst.h
index 562267cd0597f1197e1ba2ff94212b7672c96a7f..4f0fab37b44fb3f06a5fb3ed83a80d14007eb0f7 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty-subst.h
+++ b/gcc/rust/typecheck/rust-tyty-subst.h
@@ -24,8 +24,7 @@
 #include "rust-hir-full-decls.h"
 #include "rust-tyty-bounds.h"
 #include "rust-tyty-region.h"
-
-#include <optional.h>
+#include "optional.h"
 
 namespace Rust {
 namespace TyTy {

diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h
index 5d4eab42a91fdd32de66925782ae17a75c1f62e1..27a4aa28d13e438c0967669488dd40de30bf26c6 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty.h
+++ b/gcc/rust/typecheck/rust-tyty.h
@@ -27,8 +27,7 @@
 #include "rust-tyty-util.h"
 #include "rust-tyty-subst.h"
 #include "rust-tyty-region.h"
-
-#include <limits>
+#include "rust-system.h"
 
 namespace Rust {