Fix formatting of files from bootstrap fixes

2 files changed, 38 insertions, 16 deletions

diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc
index 06c2cb9..885fa60 100644
--- a/gcc/rust/rust-session-manager.cc
+++ b/gcc/rust/rust-session-manager.cc
@@ -29,15 +29,17 @@
 #include "tm_p.h"
 
 //#include "rust-target.h"
-/*TODO This isn't (currently?) necessary, but if '#include'd after '#include "target.h"', causes:
-    In file included from [...]/gcc/rust/rust-session-manager.cc:31:
+/*TODO This isn't (currently?) necessary, but if '#include'd after '#include
+   "target.h"', causes: In file included from
+   [...]/gcc/rust/rust-session-manager.cc:31:
     [...]/gcc/rust/rust-target.h:23: error: "DEFHOOK" redefined [-Werror]
        23 | #define DEFHOOK(NAME, DOC, TYPE, PARAMS, INIT) TYPE (*NAME) PARAMS;
-          | 
+	  |
     In file included from [...]/gcc/rust/rust-session-manager.cc:27:
-    [...]/gcc/target.h:272: note: this is the location of the previous definition
-      272 | #define DEFHOOK(NAME, DOC, TYPE, PARAMS, INIT) TYPE (* NAME) PARAMS;
-          | 
+    [...]/gcc/target.h:272: note: this is the location of the previous
+   definition 272 | #define DEFHOOK(NAME, DOC, TYPE, PARAMS, INIT) TYPE (* NAME)
+   PARAMS;
+	  |
 */
 
 #include "rust-lex.h"
diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h
index 8ba9a9c..596b95d 100644
--- a/gcc/rust/typecheck/rust-tyty.h
+++ b/gcc/rust/typecheck/rust-tyty.h
@@ -972,14 +972,18 @@ public:
   USizeType (HirId ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ref, TypeKind::USIZE)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
   USizeType (HirId ref, HirId ty_ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ty_ref, TypeKind::USIZE)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
@@ -1000,14 +1004,18 @@ public:
   ISizeType (HirId ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ref, TypeKind::ISIZE)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
   ISizeType (HirId ref, HirId ty_ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ty_ref, TypeKind::ISIZE)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
@@ -1028,14 +1036,18 @@ public:
   CharType (HirId ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ref, TypeKind::CHAR)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
   CharType (HirId ref, HirId ty_ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ty_ref, TypeKind::CHAR)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
@@ -1057,7 +1069,9 @@ public:
 		 std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ref, TypeKind::REF), base (base)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
@@ -1065,7 +1079,9 @@ public:
 		 std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ty_ref, TypeKind::REF), base (base)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
@@ -1093,14 +1109,18 @@ public:
   StrType (HirId ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ref, TypeKind::STR)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }
 
   StrType (HirId ref, HirId ty_ref, std::set<HirId> refs = std::set<HirId> ())
     : BaseType (ref, ty_ref, TypeKind::STR)
   {
-    //TODO unused; should 'refs' be passed as the last argument to the 'BaseType' constructor call?  Potential change in behavior (if 'refs' is provided by caller)?
+    // TODO unused; should 'refs' be passed as the last argument to the
+    // 'BaseType' constructor call?  Potential change in behavior (if 'refs' is
+    // provided by caller)?
     (void) refs;
   }