Merge branch 'master' into gfortran-testdevel/gfortran-test

6 files changed, 31 insertions, 28 deletions

diff --git a/libgrust/ChangeLog b/libgrust/ChangeLog
index a5641b7..71634f3 100644
--- a/libgrust/ChangeLog
+++ b/libgrust/ChangeLog
@@ -1,3 +1,20 @@
+2025-08-05  Marc Poulhiès  <dkm@kataplop.net>
+
+	* libproc_macro_internal/ffistring.h (FFIString__new): Likewise.
+	(FFIString__drop): Likewise.
+	* libproc_macro_internal/ident.h (Ident__new): Likewise.
+	(Ident__new_raw): Likewise.
+	(Ident__drop): Likewise.
+	(Ident__clone): Likewise.
+	* libproc_macro_internal/literal.h (Literal__from_string): Likewise.
+	* libproc_macro_internal/proc_macro.h (bridge_is_available): Likewise.
+	* libproc_macro_internal/tokenstream.h (TokenStream__new): Likewise.
+	(TokenStream__with_capacity): Likewise.
+	(TokenSream__push): Likewise.
+	(TokenStream__from_string): Likewise.
+	(TokenStream__clone): Likewise.
+	(TokenStream__drop): Likewise.
+
 2025-03-31  Arthur Cohen  <arthur.cohen@embecosm.com>
 
 	* libformat_parser/Makefile.am: Avoid using --config as it is unsupported by cargo 1.49.
diff --git a/libgrust/libproc_macro_internal/ffistring.h b/libgrust/libproc_macro_internal/ffistring.h
index e176bc2..b133b35 100644
--- a/libgrust/libproc_macro_internal/ffistring.h
+++ b/libgrust/libproc_macro_internal/ffistring.h
@@ -43,11 +43,9 @@ public:
 };
 
 extern "C" {
-FFIString
-FFIString__new (const unsigned char *data, std::uint64_t len);
+FFIString FFIString__new (const unsigned char *data, std::uint64_t len);
 
-void
-FFIString__drop (FFIString *str);
+void FFIString__drop (FFIString *str);
 }
 
 } // namespace ProcMacro
diff --git a/libgrust/libproc_macro_internal/ident.h b/libgrust/libproc_macro_internal/ident.h
index cdc9b0d..8394716 100644
--- a/libgrust/libproc_macro_internal/ident.h
+++ b/libgrust/libproc_macro_internal/ident.h
@@ -47,17 +47,13 @@ public:
 
 extern "C" {
 
-Ident
-Ident__new (FFIString str, Span span);
+Ident Ident__new (FFIString str, Span span);
 
-Ident
-Ident__new_raw (FFIString str, Span span);
+Ident Ident__new_raw (FFIString str, Span span);
 
-void
-Ident__drop (Ident *ident);
+void Ident__drop (Ident *ident);
 
-Ident
-Ident__clone (const Ident *ident);
+Ident Ident__clone (const Ident *ident);
 }
 
 } // namespace ProcMacro
diff --git a/libgrust/libproc_macro_internal/literal.h b/libgrust/libproc_macro_internal/literal.h
index c857947..b30c69a 100644
--- a/libgrust/libproc_macro_internal/literal.h
+++ b/libgrust/libproc_macro_internal/literal.h
@@ -105,8 +105,7 @@ public:
 };
 
 extern "C" {
-bool
-Literal__from_string (FFIString str, Literal *lit);
+bool Literal__from_string (FFIString str, Literal *lit);
 }
 } // namespace ProcMacro
 
diff --git a/libgrust/libproc_macro_internal/proc_macro.h b/libgrust/libproc_macro_internal/proc_macro.h
index ce9adb2..d5f2e20 100644
--- a/libgrust/libproc_macro_internal/proc_macro.h
+++ b/libgrust/libproc_macro_internal/proc_macro.h
@@ -96,8 +96,7 @@ struct ProcmacroArray
   Procmacro *macros;
 };
 
-extern "C" bool
-bridge_is_available ();
+extern "C" bool bridge_is_available ();
 
 } // namespace ProcMacro
 
diff --git a/libgrust/libproc_macro_internal/tokenstream.h b/libgrust/libproc_macro_internal/tokenstream.h
index 4e13ce7..f24d4ab 100644
--- a/libgrust/libproc_macro_internal/tokenstream.h
+++ b/libgrust/libproc_macro_internal/tokenstream.h
@@ -51,23 +51,17 @@ public:
   static void drop (TokenStream *stream);
 };
 
-extern "C" TokenStream
-TokenStream__new ();
+extern "C" TokenStream TokenStream__new ();
 
-extern "C" TokenStream
-TokenStream__with_capacity (std::uint64_t capacity);
+extern "C" TokenStream TokenStream__with_capacity (std::uint64_t capacity);
 
-extern "C" void
-TokenSream__push (TokenStream *stream, TokenTree tree);
+extern "C" void TokenSream__push (TokenStream *stream, TokenTree tree);
 
-extern "C" bool
-TokenStream__from_string (FFIString str, TokenStream *ts);
+extern "C" bool TokenStream__from_string (FFIString str, TokenStream *ts);
 
-extern "C" TokenStream
-TokenStream__clone (const TokenStream *ts);
+extern "C" TokenStream TokenStream__clone (const TokenStream *ts);
 
-extern "C" void
-TokenStream__drop (TokenStream *stream);
+extern "C" void TokenStream__drop (TokenStream *stream);
 
 } // namespace ProcMacro