From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Wed, 9 Aug 2023 16:55:37 +0000 (-0400)
Subject: gccrs: Basic formatting/comment fixes
X-Git-Tag: basepoints/gcc-15~2233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55cf783df81fc1ee088e7d32ae100eac6c7a6fda;p=thirdparty%2Fgcc.git

gccrs: Basic formatting/comment fixes

gcc/rust/ChangeLog:

	* ast/rust-ast-collector.cc: Adjust formatting.
	* checks/errors/rust-feature-gate.cc: Add trailing newline.
	* rust-diagnostics.h: Remove old comment.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---

diff --git a/gcc/rust/ast/rust-ast-collector.cc b/gcc/rust/ast/rust-ast-collector.cc
index 3b9f457d4e16..dbc3ef2997cd 100644
--- a/gcc/rust/ast/rust-ast-collector.cc
+++ b/gcc/rust/ast/rust-ast-collector.cc
@@ -2349,9 +2349,7 @@ TokenCollector::visit (MacroInvocation &invocation)
   push (Rust::Token::make (EXCLAM, UNDEF_LOCATION));
   visit (data.get_delim_tok_tree ());
   if (invocation.has_semicolon ())
-    {
-      push (Rust::Token::make (SEMICOLON, UNDEF_LOCATION));
-    }
+    push (Rust::Token::make (SEMICOLON, UNDEF_LOCATION));
 }
 
 void
diff --git a/gcc/rust/checks/errors/rust-feature-gate.cc b/gcc/rust/checks/errors/rust-feature-gate.cc
index 0f6b6c065826..be4ea7882358 100644
--- a/gcc/rust/checks/errors/rust-feature-gate.cc
+++ b/gcc/rust/checks/errors/rust-feature-gate.cc
@@ -168,4 +168,4 @@ FeatureGate::visit (AST::ExternalTypeItem &item)
 	"extern types are experimental");
 }
 
-} // namespace Rust
\ No newline at end of file
+} // namespace Rust
diff --git a/gcc/rust/rust-diagnostics.h b/gcc/rust/rust-diagnostics.h
index a2546348cfe9..a38dd0d42a81 100644
--- a/gcc/rust/rust-diagnostics.h
+++ b/gcc/rust/rust-diagnostics.h
@@ -221,8 +221,6 @@ struct Error
 // rust_debug uses normal printf formatting, not GCC diagnostic formatting.
 #define rust_debug(...) rust_debug_loc (UNDEF_LOCATION, __VA_ARGS__)
 
-// rust_sorry_at wraps GCC diagnostic "sorry_at" to accept "Location" instead of
-// "location_t"
 #define rust_sorry_at(location, ...) sorry_at (location, __VA_ARGS__)
 
 void