Switch default sorting order for items to "None"

docs.md

@@ -688,8 +688,8 @@ rename_args = "PascalCase"
 # "Name": sort by the name of the function
 # "None": keep order in which the functions have been parsed
 #
-# default: "Name"
-sort_by = "None"
+# default: "None"
+sort_by = "Name"
 
 [struct]
 # A rule to use to rename struct field names. The renaming assumes the input is
@@ -890,8 +890,8 @@ allow_constexpr = false
 # "Name": sort by the name of the constant
 # "None": keep order in which the constants have been parsed
 #
-# default: "Name"
-sort_by = "None"
+# default: "None"
+sort_by = "Name"
 
 
 

src/bindgen/config.rs

@@ -894,7 +894,7 @@ impl Default for Config {
             language: Language::Cxx,
             cpp_compat: false,
             style: Style::Type,
-            sort_by: SortKey::Name,
+            sort_by: SortKey::None,
             macro_expansion: Default::default(),
             parse: ParseConfig::default(),
             export: ExportConfig::default(),

tests/expectations/both/box.c

@@ -17,8 +17,8 @@ typedef struct MyStruct {
   int32_t *number;
 } MyStruct;
 
+void root(const Foo *a, const MyStruct *with_box);
+
 void drop_box(int32_t *x);
 
 void drop_box_opt(int32_t *x);
-
-void root(const Foo *a, const MyStruct *with_box);

tests/expectations/both/box.compat.c

@@ -21,12 +21,12 @@ typedef struct MyStruct {
 extern "C" {
 #endif // __cplusplus
 
+void root(const Foo *a, const MyStruct *with_box);
+
 void drop_box(int32_t *x);
 
 void drop_box_opt(int32_t *x);
 
-void root(const Foo *a, const MyStruct *with_box);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/constant.c

@@ -3,19 +3,28 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CAST (uint8_t)'A'
+#define FOO 10
 
 #define DELIMITER ':'
 
-#define DOUBLE_CAST (uint32_t)(float)1
+#define LEFTCURLY '{'
 
-#define EQUID U'\U00010083'
+#define QUOTE '\''
 
-#define FOO 10
+#define TAB '\t'
+
+#define NEWLINE '\n'
 
 #define HEART U'\U00002764'
 
-#define LEFTCURLY '{'
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
 
 /**
  * A
@@ -25,26 +34,17 @@
  */
 #define NEG_ONE -1
 
-#define NEWLINE '\n'
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-#define QUOTE '\''
-
 #define SHIFT 3
 
-#define TAB '\t'
-
 #define XBOOL 1
 
 #define XFALSE ((0 << SHIFT) | XBOOL)
 
 #define XTRUE (1 << (SHIFT | XBOOL))
 
-#define ZOM 3.14
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
 
 typedef struct Foo {
   int32_t x[FOO];

tests/expectations/both/constant.compat.c

@@ -3,19 +3,28 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CAST (uint8_t)'A'
+#define FOO 10
 
 #define DELIMITER ':'
 
-#define DOUBLE_CAST (uint32_t)(float)1
+#define LEFTCURLY '{'
 
-#define EQUID U'\U00010083'
+#define QUOTE '\''
 
-#define FOO 10
+#define TAB '\t'
+
+#define NEWLINE '\n'
 
 #define HEART U'\U00002764'
 
-#define LEFTCURLY '{'
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
 
 /**
  * A
@@ -25,26 +34,17 @@
  */
 #define NEG_ONE -1
 
-#define NEWLINE '\n'
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-#define QUOTE '\''
-
 #define SHIFT 3
 
-#define TAB '\t'
-
 #define XBOOL 1
 
 #define XFALSE ((0 << SHIFT) | XBOOL)
 
 #define XTRUE (1 << (SHIFT | XBOOL))
 
-#define ZOM 3.14
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
 
 typedef struct Foo {
   int32_t x[FOO];

tests/expectations/both/constant_big.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
 
 #define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
 
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
+#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+
+#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807

tests/expectations/both/constant_big.compat.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
 
 #define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
 
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
+#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+
+#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807

tests/expectations/both/constant_constexpr.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CONSTANT_FLOAT32 312.292
-
 #define CONSTANT_I64 216
 
+#define CONSTANT_FLOAT32 312.292
+
 #define DELIMITER ':'
 
 #define LEFTCURLY '{'

tests/expectations/both/constant_constexpr.compat.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CONSTANT_FLOAT32 312.292
-
 #define CONSTANT_I64 216
 
+#define CONSTANT_FLOAT32 312.292
+
 #define DELIMITER ':'
 
 #define LEFTCURLY '{'

tests/expectations/both/expand_features.c

@@ -7,8 +7,8 @@ typedef struct Foo {
 
 } Foo;
 
-void cbindgen(void);
-
 void extra_debug_fn(void);
 
+void cbindgen(void);
+
 void root(Foo a);

tests/expectations/both/expand_features.compat.c

@@ -11,10 +11,10 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void cbindgen(void);
-
 void extra_debug_fn(void);
 
+void cbindgen(void);
+
 void root(Foo a);
 
 #ifdef __cplusplus

tests/expectations/both/extern.c

@@ -8,6 +8,6 @@ typedef struct Normal {
   float y;
 } Normal;
 
-extern void bar(Normal a);
-
 extern int32_t foo(void);
+
+extern void bar(Normal a);

tests/expectations/both/extern.compat.c

@@ -12,10 +12,10 @@ typedef struct Normal {
 extern "C" {
 #endif // __cplusplus
 
-extern void bar(Normal a);
-
 extern int32_t foo(void);
 
+extern void bar(Normal a);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/fns.c

@@ -11,6 +11,6 @@ typedef struct Fns {
   int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
 } Fns;
 
-void no_return(void);
-
 void root(Fns _fns);
+
+void no_return(void);

tests/expectations/both/fns.compat.c

@@ -15,10 +15,10 @@ typedef struct Fns {
 extern "C" {
 #endif // __cplusplus
 
-void no_return(void);
-
 void root(Fns _fns);
 
+void no_return(void);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/function_args.c

@@ -3,8 +3,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+void unnamed(const uint64_t*);
+
 void pointer_test(const uint64_t *a);
 
 void print_from_rust(void);
-
-void unnamed(const uint64_t*);

tests/expectations/both/function_args.compat.c

@@ -7,12 +7,12 @@
 extern "C" {
 #endif // __cplusplus
 
+void unnamed(const uint64_t*);
+
 void pointer_test(const uint64_t *a);
 
 void print_from_rust(void);
 
-void unnamed(const uint64_t*);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/global_variable.c

@@ -3,6 +3,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-extern const char CONST_GLOBAL_ARRAY[128];
-
 extern char MUT_GLOBAL_ARRAY[128];
+
+extern const char CONST_GLOBAL_ARRAY[128];

tests/expectations/both/global_variable.compat.c

@@ -7,10 +7,10 @@
 extern "C" {
 #endif // __cplusplus
 
-extern const char CONST_GLOBAL_ARRAY[128];
-
 extern char MUT_GLOBAL_ARRAY[128];
 
+extern const char CONST_GLOBAL_ARRAY[128];
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/mod_attr.c

@@ -3,18 +3,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#if defined(BAR)
-#define BAR 2
-#endif
-
 #if defined(FOO)
 #define FOO 1
 #endif
 
 #if defined(BAR)
-typedef struct Bar {
-
-} Bar;
+#define BAR 2
 #endif
 
 #if defined(FOO)
@@ -24,9 +18,15 @@ typedef struct Foo {
 #endif
 
 #if defined(BAR)
-void bar(const Bar *bar);
+typedef struct Bar {
+
+} Bar;
 #endif
 
 #if defined(FOO)
 void foo(const Foo *foo);
 #endif
+
+#if defined(BAR)
+void bar(const Bar *bar);
+#endif

tests/expectations/both/mod_attr.compat.c

@@ -3,18 +3,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#if defined(BAR)
-#define BAR 2
-#endif
-
 #if defined(FOO)
 #define FOO 1
 #endif
 
 #if defined(BAR)
-typedef struct Bar {
-
-} Bar;
+#define BAR 2
 #endif
 
 #if defined(FOO)
@@ -23,18 +17,24 @@ typedef struct Foo {
 } Foo;
 #endif
 
+#if defined(BAR)
+typedef struct Bar {
+
+} Bar;
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-#if defined(BAR)
-void bar(const Bar *bar);
-#endif
-
 #if defined(FOO)
 void foo(const Foo *foo);
 #endif
 
+#if defined(BAR)
+void bar(const Bar *bar);
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/monomorph-2.c

@@ -7,16 +7,16 @@ typedef struct A A;
 
 typedef struct B B;
 
-typedef struct List_B {
-  B *members;
-  uintptr_t count;
-} List_B;
-
 typedef struct List_A {
   A *members;
   uintptr_t count;
 } List_A;
 
-void bar(List_B b);
+typedef struct List_B {
+  B *members;
+  uintptr_t count;
+} List_B;
 
 void foo(List_A a);
+
+void bar(List_B b);

tests/expectations/both/monomorph-2.compat.c

@@ -7,24 +7,24 @@ typedef struct A A;
 
 typedef struct B B;
 
-typedef struct List_B {
-  B *members;
-  uintptr_t count;
-} List_B;
-
 typedef struct List_A {
   A *members;
   uintptr_t count;
 } List_A;
 
+typedef struct List_B {
+  B *members;
+  uintptr_t count;
+} List_B;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void bar(List_B b);
-
 void foo(List_A a);
 
+void bar(List_B b);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/nonnull_attribute.c

@@ -12,6 +12,13 @@
 
 typedef struct Opaque Opaque;
 
+typedef struct References {
+  const Opaque *CBINDGEN_NONNULL a;
+  Opaque *CBINDGEN_NONNULL b;
+  const Opaque *c;
+  Opaque *d;
+} References;
+
 typedef struct Pointers_u64 {
   float *CBINDGEN_NONNULL a;
   uint64_t *CBINDGEN_NONNULL b;
@@ -26,27 +33,20 @@ typedef struct Pointers_u64 {
   uint64_t *k;
 } Pointers_u64;
 
-typedef struct References {
-  const Opaque *CBINDGEN_NONNULL a;
-  Opaque *CBINDGEN_NONNULL b;
-  const Opaque *c;
-  Opaque *d;
-} References;
-
-void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
+void value_arg(References arg);
 
 void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
                     Pointers_u64 *foo,
                     Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
 
-void nullable_const_ptr(const Pointers_u64 *arg);
+void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
 
-void nullable_mut_ptr(Pointers_u64 *arg);
-
-void optional_mut_ref_arg(Pointers_u64 *arg);
+void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
 
 void optional_ref_arg(const Pointers_u64 *arg);
 
-void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
+void optional_mut_ref_arg(Pointers_u64 *arg);
 
-void value_arg(References arg);
+void nullable_const_ptr(const Pointers_u64 *arg);
+
+void nullable_mut_ptr(Pointers_u64 *arg);

tests/expectations/both/nonnull_attribute.compat.c

@@ -12,6 +12,13 @@
 
 typedef struct Opaque Opaque;
 
+typedef struct References {
+  const Opaque *CBINDGEN_NONNULL a;
+  Opaque *CBINDGEN_NONNULL b;
+  const Opaque *c;
+  Opaque *d;
+} References;
+
 typedef struct Pointers_u64 {
   float *CBINDGEN_NONNULL a;
   uint64_t *CBINDGEN_NONNULL b;
@@ -26,35 +33,28 @@ typedef struct Pointers_u64 {
   uint64_t *k;
 } Pointers_u64;
 
-typedef struct References {
-  const Opaque *CBINDGEN_NONNULL a;
-  Opaque *CBINDGEN_NONNULL b;
-  const Opaque *c;
-  Opaque *d;
-} References;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
+void value_arg(References arg);
 
 void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
                     Pointers_u64 *foo,
                     Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
 
+void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void optional_ref_arg(const Pointers_u64 *arg);
+
+void optional_mut_ref_arg(Pointers_u64 *arg);
+
 void nullable_const_ptr(const Pointers_u64 *arg);
 
 void nullable_mut_ptr(Pointers_u64 *arg);
 
-void optional_mut_ref_arg(Pointers_u64 *arg);
-
-void optional_ref_arg(const Pointers_u64 *arg);
-
-void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void value_arg(References arg);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/ptrs_as_arrays.c

@@ -9,6 +9,6 @@ void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
 
 void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
 
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
-
 void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
+
+void ptr_as_array_unnamed(uint32_t*, const uint32_t*);

tests/expectations/both/ptrs_as_arrays.compat.c

@@ -13,10 +13,10 @@ void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
 
 void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
 
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
-
 void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
 
+void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/both/rename-crate.c

@@ -3,6 +3,14 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef struct Foo {
+  int32_t x;
+} Foo;
+
+typedef struct RenamedTy {
+  uint64_t y;
+} RenamedTy;
+
 #if !defined(DEFINE_FREEBSD)
 typedef struct NoExternTy {
   uint8_t field;
@@ -21,16 +29,8 @@ typedef struct ContainsNoExternTy {
 } ContainsNoExternTy;
 #endif
 
-typedef struct RenamedTy {
-  uint64_t y;
-} RenamedTy;
-
-typedef struct Foo {
-  int32_t x;
-} Foo;
-
-void no_extern_func(ContainsNoExternTy a);
+void root(Foo a);
 
 void renamed_func(RenamedTy a);
 
-void root(Foo a);
+void no_extern_func(ContainsNoExternTy a);

tests/expectations/both/rename-crate.compat.c

@@ -3,6 +3,14 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef struct Foo {
+  int32_t x;
+} Foo;
+
+typedef struct RenamedTy {
+  uint64_t y;
+} RenamedTy;
+
 #if !defined(DEFINE_FREEBSD)
 typedef struct NoExternTy {
   uint8_t field;
@@ -21,23 +29,15 @@ typedef struct ContainsNoExternTy {
 } ContainsNoExternTy;
 #endif
 
-typedef struct RenamedTy {
-  uint64_t y;
-} RenamedTy;
-
-typedef struct Foo {
-  int32_t x;
-} Foo;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void no_extern_func(ContainsNoExternTy a);
+void root(Foo a);
 
 void renamed_func(RenamedTy a);
 
-void root(Foo a);
+void no_extern_func(ContainsNoExternTy a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/both/static.c

@@ -9,10 +9,10 @@ typedef struct Foo {
 
 } Foo;
 
-extern const Bar BAR;
+extern const int32_t NUMBER;
 
 extern Foo FOO;
 
-extern const int32_t NUMBER;
+extern const Bar BAR;
 
 void root(void);

tests/expectations/both/static.compat.c

@@ -13,11 +13,11 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-extern const Bar BAR;
+extern const int32_t NUMBER;
 
 extern Foo FOO;
 
-extern const int32_t NUMBER;
+extern const Bar BAR;
 
 void root(void);
 

tests/expectations/both/swift_name.c

@@ -7,49 +7,49 @@
 
 typedef struct Opaque Opaque;
 
-typedef struct PointerToOpaque {
-  Opaque *ptr;
-} PointerToOpaque;
-
 typedef struct SelfTypeTestStruct {
   uint8_t times;
 } SelfTypeTestStruct;
 
-PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+typedef struct PointerToOpaque {
+  Opaque *ptr;
+} PointerToOpaque;
 
-void PointerToOpaque_sayHello(PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
 
 void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
 
 void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
 
-void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
 void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
 
 SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
 
-void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
 
-void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
 
 void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
 
 void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
 
+void unnamed_argument(SelfTypeTestStruct*);
+
 void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
 
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
 
-void unnamed_argument(SelfTypeTestStruct*);
+void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
+PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+
+void PointerToOpaque_sayHello(PointerToOpaque self)
+/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));

tests/expectations/both/swift_name.compat.c

@@ -7,57 +7,57 @@
 
 typedef struct Opaque Opaque;
 
-typedef struct PointerToOpaque {
-  Opaque *ptr;
-} PointerToOpaque;
-
 typedef struct SelfTypeTestStruct {
   uint8_t times;
 } SelfTypeTestStruct;
 
+typedef struct PointerToOpaque {
+  Opaque *ptr;
+} PointerToOpaque;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+
+void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
+
+void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
+
+void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
+
+SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
+
+void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+
+void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
+
+void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
+
+void unnamed_argument(SelfTypeTestStruct*);
+
+void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
+
+void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+
+void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
 PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
 
 void PointerToOpaque_sayHello(PointerToOpaque self)
 /*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
 
-void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
-
-void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
-
-void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
-
-void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
-void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
-
-SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
-
-void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
-
-void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
-
-void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
-
-void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
-
-void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
-
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
-
-void unnamed_argument(SelfTypeTestStruct*);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/box.c

@@ -17,8 +17,8 @@ typedef struct {
   int32_t *number;
 } MyStruct;
 
+void root(const Foo *a, const MyStruct *with_box);
+
 void drop_box(int32_t *x);
 
 void drop_box_opt(int32_t *x);
-
-void root(const Foo *a, const MyStruct *with_box);

tests/expectations/box.compat.c

@@ -21,12 +21,12 @@ typedef struct {
 extern "C" {
 #endif // __cplusplus
 
+void root(const Foo *a, const MyStruct *with_box);
+
 void drop_box(int32_t *x);
 
 void drop_box_opt(int32_t *x);
 
-void root(const Foo *a, const MyStruct *with_box);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/box.cpp

@@ -24,10 +24,10 @@ struct MyStruct {
 
 extern "C" {
 
+void root(const Foo *a, const MyStruct *with_box);
+
 void drop_box(Box<int32_t> x);
 
 void drop_box_opt(Option<Box<int32_t>> x);
 
-void root(const Foo *a, const MyStruct *with_box);
-
 } // extern "C"

tests/expectations/constant.c

@@ -3,19 +3,28 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CAST (uint8_t)'A'
+#define FOO 10
 
 #define DELIMITER ':'
 
-#define DOUBLE_CAST (uint32_t)(float)1
+#define LEFTCURLY '{'
 
-#define EQUID U'\U00010083'
+#define QUOTE '\''
 
-#define FOO 10
+#define TAB '\t'
+
+#define NEWLINE '\n'
 
 #define HEART U'\U00002764'
 
-#define LEFTCURLY '{'
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
 
 /**
  * A
@@ -25,26 +34,17 @@
  */
 #define NEG_ONE -1
 
-#define NEWLINE '\n'
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-#define QUOTE '\''
-
 #define SHIFT 3
 
-#define TAB '\t'
-
 #define XBOOL 1
 
 #define XFALSE ((0 << SHIFT) | XBOOL)
 
 #define XTRUE (1 << (SHIFT | XBOOL))
 
-#define ZOM 3.14
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
 
 typedef struct {
   int32_t x[FOO];

tests/expectations/constant.compat.c

@@ -3,19 +3,28 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CAST (uint8_t)'A'
+#define FOO 10
 
 #define DELIMITER ':'
 
-#define DOUBLE_CAST (uint32_t)(float)1
+#define LEFTCURLY '{'
 
-#define EQUID U'\U00010083'
+#define QUOTE '\''
 
-#define FOO 10
+#define TAB '\t'
+
+#define NEWLINE '\n'
 
 #define HEART U'\U00002764'
 
-#define LEFTCURLY '{'
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
 
 /**
  * A
@@ -25,26 +34,17 @@
  */
 #define NEG_ONE -1
 
-#define NEWLINE '\n'
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-#define QUOTE '\''
-
 #define SHIFT 3
 
-#define TAB '\t'
-
 #define XBOOL 1
 
 #define XFALSE ((0 << SHIFT) | XBOOL)
 
 #define XTRUE (1 << (SHIFT | XBOOL))
 
-#define ZOM 3.14
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
 
 typedef struct {
   int32_t x[FOO];

tests/expectations/constant.cpp

@@ -4,19 +4,26 @@
 #include <ostream>
 #include <new>
 
-static const uint8_t CAST = (uint8_t)'A';
+static const int32_t FOO = 10;
 
 static const uint32_t DELIMITER = ':';
 
-static const uint32_t DOUBLE_CAST = (uint32_t)(float)1;
+static const uint32_t LEFTCURLY = '{';
 
-static const uint32_t EQUID = U'\U00010083';
+static const uint32_t QUOTE = '\'';
 
-static const int32_t FOO = 10;
+static const uint32_t TAB = '\t';
+
+static const uint32_t NEWLINE = '\n';
 
 static const uint32_t HEART = U'\U00002764';
 
-static const uint32_t LEFTCURLY = '{';
+static const uint32_t EQUID = U'\U00010083';
+
+static const float ZOM = 3.14;
+
+/// A single-line doc comment.
+static const int8_t POS_ONE = 1;
 
 /// A
 /// multi-line
@@ -24,24 +31,17 @@ static const uint32_t LEFTCURLY = '{';
 /// comment.
 static const int8_t NEG_ONE = -1;
 
-static const uint32_t NEWLINE = '\n';
-
-/// A single-line doc comment.
-static const int8_t POS_ONE = 1;
-
-static const uint32_t QUOTE = '\'';
-
 static const int64_t SHIFT = 3;
 
-static const uint32_t TAB = '\t';
-
 static const int64_t XBOOL = 1;
 
 static const int64_t XFALSE = ((0 << SHIFT) | XBOOL);
 
 static const int64_t XTRUE = (1 << (SHIFT | XBOOL));
 
-static const float ZOM = 3.14;
+static const uint8_t CAST = (uint8_t)'A';
+
+static const uint32_t DOUBLE_CAST = (uint32_t)(float)1;
 
 struct Foo {
   int32_t x[FOO];

tests/expectations/constant_big.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
 
 #define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
 
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
+#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+
+#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807

tests/expectations/constant_big.compat.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
 
 #define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
 
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
+#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+
+#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807

tests/expectations/constant_big.cpp

@@ -4,10 +4,10 @@
 #include <ostream>
 #include <new>
 
-static const int64_t SIGNED_DOESNT_NEED_ULL_SUFFIX = -9223372036854775807;
-
-static const int64_t SIGNED_NEEDS_ULL_SUFFIX = -9223372036854775808ULL;
+static const uint64_t UNSIGNED_NEEDS_ULL_SUFFIX = 9223372036854775808ULL;
 
 static const uint64_t UNSIGNED_DOESNT_NEED_ULL_SUFFIX = 8070450532247928832;
 
-static const uint64_t UNSIGNED_NEEDS_ULL_SUFFIX = 9223372036854775808ULL;
+static const int64_t SIGNED_NEEDS_ULL_SUFFIX = -9223372036854775808ULL;
+
+static const int64_t SIGNED_DOESNT_NEED_ULL_SUFFIX = -9223372036854775807;

tests/expectations/constant_constexpr.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CONSTANT_FLOAT32 312.292
-
 #define CONSTANT_I64 216
 
+#define CONSTANT_FLOAT32 312.292
+
 #define DELIMITER ':'
 
 #define LEFTCURLY '{'

tests/expectations/constant_constexpr.compat.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CONSTANT_FLOAT32 312.292
-
 #define CONSTANT_I64 216
 
+#define CONSTANT_FLOAT32 312.292
+
 #define DELIMITER ':'
 
 #define LEFTCURLY '{'

tests/expectations/constant_constexpr.cpp

@@ -4,10 +4,10 @@
 #include <ostream>
 #include <new>
 
-constexpr static const float CONSTANT_FLOAT32 = 312.292;
-
 constexpr static const int64_t CONSTANT_I64 = 216;
 
+constexpr static const float CONSTANT_FLOAT32 = 312.292;
+
 constexpr static const uint32_t DELIMITER = ':';
 
 constexpr static const uint32_t LEFTCURLY = '{';

tests/expectations/expand_features.c

@@ -7,8 +7,8 @@ typedef struct {
 
 } Foo;
 
-void cbindgen(void);
-
 void extra_debug_fn(void);
 
+void cbindgen(void);
+
 void root(Foo a);

tests/expectations/expand_features.compat.c

@@ -11,10 +11,10 @@ typedef struct {
 extern "C" {
 #endif // __cplusplus
 
-void cbindgen(void);
-
 void extra_debug_fn(void);
 
+void cbindgen(void);
+
 void root(Foo a);
 
 #ifdef __cplusplus

tests/expectations/expand_features.cpp

@@ -10,10 +10,10 @@ struct Foo {
 
 extern "C" {
 
-void cbindgen();
-
 void extra_debug_fn();
 
+void cbindgen();
+
 void root(Foo a);
 
 } // extern "C"

tests/expectations/extern.c

@@ -8,6 +8,6 @@ typedef struct {
   float y;
 } Normal;
 
-extern void bar(Normal a);
-
 extern int32_t foo(void);
+
+extern void bar(Normal a);

tests/expectations/extern.compat.c

@@ -12,10 +12,10 @@ typedef struct {
 extern "C" {
 #endif // __cplusplus
 
-extern void bar(Normal a);
-
 extern int32_t foo(void);
 
+extern void bar(Normal a);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/extern.cpp

@@ -11,8 +11,8 @@ struct Normal {
 
 extern "C" {
 
-extern void bar(Normal a);
-
 extern int32_t foo();
 
+extern void bar(Normal a);
+
 } // extern "C"

tests/expectations/fns.c

@@ -11,6 +11,6 @@ typedef struct {
   int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
 } Fns;
 
-void no_return(void);
-
 void root(Fns _fns);
+
+void no_return(void);

tests/expectations/fns.compat.c

@@ -15,10 +15,10 @@ typedef struct {
 extern "C" {
 #endif // __cplusplus
 
-void no_return(void);
-
 void root(Fns _fns);
 
+void no_return(void);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/fns.cpp

@@ -14,8 +14,8 @@ struct Fns {
 
 extern "C" {
 
-void no_return();
-
 void root(Fns _fns);
 
+void no_return();
+
 } // extern "C"

tests/expectations/function_args.c

@@ -3,8 +3,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+void unnamed(const uint64_t*);
+
 void pointer_test(const uint64_t *a);
 
 void print_from_rust(void);
-
-void unnamed(const uint64_t*);

tests/expectations/function_args.compat.c

@@ -7,12 +7,12 @@
 extern "C" {
 #endif // __cplusplus
 
+void unnamed(const uint64_t*);
+
 void pointer_test(const uint64_t *a);
 
 void print_from_rust(void);
 
-void unnamed(const uint64_t*);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/function_args.cpp

@@ -6,10 +6,10 @@
 
 extern "C" {
 
+void unnamed(const uint64_t*);
+
 void pointer_test(const uint64_t *a);
 
 void print_from_rust();
 
-void unnamed(const uint64_t*);
-
 } // extern "C"

tests/expectations/global_variable.c

@@ -3,6 +3,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-extern const char CONST_GLOBAL_ARRAY[128];
-
 extern char MUT_GLOBAL_ARRAY[128];
+
+extern const char CONST_GLOBAL_ARRAY[128];

tests/expectations/global_variable.compat.c

@@ -7,10 +7,10 @@
 extern "C" {
 #endif // __cplusplus
 
-extern const char CONST_GLOBAL_ARRAY[128];
-
 extern char MUT_GLOBAL_ARRAY[128];
 
+extern const char CONST_GLOBAL_ARRAY[128];
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/global_variable.cpp

@@ -6,8 +6,8 @@
 
 extern "C" {
 
-extern const char CONST_GLOBAL_ARRAY[128];
-
 extern char MUT_GLOBAL_ARRAY[128];
 
+extern const char CONST_GLOBAL_ARRAY[128];
+
 } // extern "C"

tests/expectations/mod_attr.c

@@ -3,18 +3,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#if defined(BAR)
-#define BAR 2
-#endif
-
 #if defined(FOO)
 #define FOO 1
 #endif
 
 #if defined(BAR)
-typedef struct {
-
-} Bar;
+#define BAR 2
 #endif
 
 #if defined(FOO)
@@ -24,9 +18,15 @@ typedef struct {
 #endif
 
 #if defined(BAR)
-void bar(const Bar *bar);
+typedef struct {
+
+} Bar;
 #endif
 
 #if defined(FOO)
 void foo(const Foo *foo);
 #endif
+
+#if defined(BAR)
+void bar(const Bar *bar);
+#endif

tests/expectations/mod_attr.compat.c

@@ -3,18 +3,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#if defined(BAR)
-#define BAR 2
-#endif
-
 #if defined(FOO)
 #define FOO 1
 #endif
 
 #if defined(BAR)
-typedef struct {
-
-} Bar;
+#define BAR 2
 #endif
 
 #if defined(FOO)
@@ -23,18 +17,24 @@ typedef struct {
 } Foo;
 #endif
 
+#if defined(BAR)
+typedef struct {
+
+} Bar;
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-#if defined(BAR)
-void bar(const Bar *bar);
-#endif
-
 #if defined(FOO)
 void foo(const Foo *foo);
 #endif
 
+#if defined(BAR)
+void bar(const Bar *bar);
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/mod_attr.cpp

@@ -4,18 +4,12 @@
 #include <ostream>
 #include <new>
 
-#if defined(BAR)
-static const int32_t BAR = 2;
-#endif
-
 #if defined(FOO)
 static const int32_t FOO = 1;
 #endif
 
 #if defined(BAR)
-struct Bar {
-
-};
+static const int32_t BAR = 2;
 #endif
 
 #if defined(FOO)
@@ -24,14 +18,20 @@ struct Foo {
 };
 #endif
 
-extern "C" {
-
 #if defined(BAR)
-void bar(const Bar *bar);
+struct Bar {
+
+};
 #endif
 
+extern "C" {
+
 #if defined(FOO)
 void foo(const Foo *foo);
 #endif
 
+#if defined(BAR)
+void bar(const Bar *bar);
+#endif
+
 } // extern "C"

tests/expectations/monomorph-2.c

@@ -7,16 +7,16 @@ typedef struct A A;
 
 typedef struct B B;
 
-typedef struct {
-  B *members;
-  uintptr_t count;
-} List_B;
-
 typedef struct {
   A *members;
   uintptr_t count;
 } List_A;
 
-void bar(List_B b);
+typedef struct {
+  B *members;
+  uintptr_t count;
+} List_B;
 
 void foo(List_A a);
+
+void bar(List_B b);

tests/expectations/monomorph-2.compat.c

@@ -7,24 +7,24 @@ typedef struct A A;
 
 typedef struct B B;
 
-typedef struct {
-  B *members;
-  uintptr_t count;
-} List_B;
-
 typedef struct {
   A *members;
   uintptr_t count;
 } List_A;
 
+typedef struct {
+  B *members;
+  uintptr_t count;
+} List_B;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void bar(List_B b);
-
 void foo(List_A a);
 
+void bar(List_B b);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/monomorph-2.cpp

@@ -16,8 +16,8 @@ struct List {
 
 extern "C" {
 
-void bar(List<B> b);
-
 void foo(List<A> a);
 
+void bar(List<B> b);
+
 } // extern "C"

tests/expectations/nonnull_attribute.c

@@ -12,6 +12,13 @@
 
 typedef struct Opaque Opaque;
 
+typedef struct {
+  const Opaque *CBINDGEN_NONNULL a;
+  Opaque *CBINDGEN_NONNULL b;
+  const Opaque *c;
+  Opaque *d;
+} References;
+
 typedef struct {
   float *CBINDGEN_NONNULL a;
   uint64_t *CBINDGEN_NONNULL b;
@@ -26,27 +33,20 @@ typedef struct {
   uint64_t *k;
 } Pointers_u64;
 
-typedef struct {
-  const Opaque *CBINDGEN_NONNULL a;
-  Opaque *CBINDGEN_NONNULL b;
-  const Opaque *c;
-  Opaque *d;
-} References;
-
-void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
+void value_arg(References arg);
 
 void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
                     Pointers_u64 *foo,
                     Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
 
-void nullable_const_ptr(const Pointers_u64 *arg);
+void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
 
-void nullable_mut_ptr(Pointers_u64 *arg);
-
-void optional_mut_ref_arg(Pointers_u64 *arg);
+void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
 
 void optional_ref_arg(const Pointers_u64 *arg);
 
-void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
+void optional_mut_ref_arg(Pointers_u64 *arg);
 
-void value_arg(References arg);
+void nullable_const_ptr(const Pointers_u64 *arg);
+
+void nullable_mut_ptr(Pointers_u64 *arg);

tests/expectations/nonnull_attribute.compat.c

@@ -12,6 +12,13 @@
 
 typedef struct Opaque Opaque;
 
+typedef struct {
+  const Opaque *CBINDGEN_NONNULL a;
+  Opaque *CBINDGEN_NONNULL b;
+  const Opaque *c;
+  Opaque *d;
+} References;
+
 typedef struct {
   float *CBINDGEN_NONNULL a;
   uint64_t *CBINDGEN_NONNULL b;
@@ -26,35 +33,28 @@ typedef struct {
   uint64_t *k;
 } Pointers_u64;
 
-typedef struct {
-  const Opaque *CBINDGEN_NONNULL a;
-  Opaque *CBINDGEN_NONNULL b;
-  const Opaque *c;
-  Opaque *d;
-} References;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
+void value_arg(References arg);
 
 void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
                     Pointers_u64 *foo,
                     Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
 
+void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void optional_ref_arg(const Pointers_u64 *arg);
+
+void optional_mut_ref_arg(Pointers_u64 *arg);
+
 void nullable_const_ptr(const Pointers_u64 *arg);
 
 void nullable_mut_ptr(Pointers_u64 *arg);
 
-void optional_mut_ref_arg(Pointers_u64 *arg);
-
-void optional_ref_arg(const Pointers_u64 *arg);
-
-void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void value_arg(References arg);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/nonnull_attribute.cpp

@@ -13,6 +13,13 @@
 
 struct Opaque;
 
+struct References {
+  const Opaque *CBINDGEN_NONNULL a;
+  Opaque *CBINDGEN_NONNULL b;
+  const Opaque *c;
+  Opaque *d;
+};
+
 template<typename T>
 struct Pointers {
   float *CBINDGEN_NONNULL a;
@@ -28,31 +35,24 @@ struct Pointers {
   T *k;
 };
 
-struct References {
-  const Opaque *CBINDGEN_NONNULL a;
-  Opaque *CBINDGEN_NONNULL b;
-  const Opaque *c;
-  Opaque *d;
-};
-
 extern "C" {
 
-void mut_ref_arg(Pointers<uint64_t> *CBINDGEN_NONNULL arg);
+void value_arg(References arg);
 
 void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
                     Pointers<uint64_t> *foo,
                     Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
 
+void ref_arg(const Pointers<uint64_t> *CBINDGEN_NONNULL arg);
+
+void mut_ref_arg(Pointers<uint64_t> *CBINDGEN_NONNULL arg);
+
+void optional_ref_arg(const Pointers<uint64_t> *arg);
+
+void optional_mut_ref_arg(Pointers<uint64_t> *arg);
+
 void nullable_const_ptr(const Pointers<uint64_t> *arg);
 
 void nullable_mut_ptr(Pointers<uint64_t> *arg);
 
-void optional_mut_ref_arg(Pointers<uint64_t> *arg);
-
-void optional_ref_arg(const Pointers<uint64_t> *arg);
-
-void ref_arg(const Pointers<uint64_t> *CBINDGEN_NONNULL arg);
-
-void value_arg(References arg);
-
 } // extern "C"

tests/expectations/ptrs_as_arrays.c

@@ -9,6 +9,6 @@ void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
 
 void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
 
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
-
 void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
+
+void ptr_as_array_unnamed(uint32_t*, const uint32_t*);

tests/expectations/ptrs_as_arrays.compat.c

@@ -13,10 +13,10 @@ void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
 
 void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
 
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
-
 void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
 
+void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/ptrs_as_arrays.cpp

@@ -12,8 +12,8 @@ void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
 
 void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
 
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
-
 void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
 
+void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
+
 } // extern "C"

tests/expectations/rename-crate.c

@@ -3,6 +3,14 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef struct {
+  int32_t x;
+} Foo;
+
+typedef struct {
+  uint64_t y;
+} RenamedTy;
+
 #if !defined(DEFINE_FREEBSD)
 typedef struct {
   uint8_t field;
@@ -21,16 +29,8 @@ typedef struct {
 } ContainsNoExternTy;
 #endif
 
-typedef struct {
-  uint64_t y;
-} RenamedTy;
-
-typedef struct {
-  int32_t x;
-} Foo;
-
-void no_extern_func(ContainsNoExternTy a);
+void root(Foo a);
 
 void renamed_func(RenamedTy a);
 
-void root(Foo a);
+void no_extern_func(ContainsNoExternTy a);

tests/expectations/rename-crate.compat.c

@@ -3,6 +3,14 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef struct {
+  int32_t x;
+} Foo;
+
+typedef struct {
+  uint64_t y;
+} RenamedTy;
+
 #if !defined(DEFINE_FREEBSD)
 typedef struct {
   uint8_t field;
@@ -21,23 +29,15 @@ typedef struct {
 } ContainsNoExternTy;
 #endif
 
-typedef struct {
-  uint64_t y;
-} RenamedTy;
-
-typedef struct {
-  int32_t x;
-} Foo;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void no_extern_func(ContainsNoExternTy a);
+void root(Foo a);
 
 void renamed_func(RenamedTy a);
 
-void root(Foo a);
+void no_extern_func(ContainsNoExternTy a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/rename-crate.cpp

@@ -4,6 +4,14 @@
 #include <ostream>
 #include <new>
 
+struct Foo {
+  int32_t x;
+};
+
+struct RenamedTy {
+  uint64_t y;
+};
+
 #if !defined(DEFINE_FREEBSD)
 struct NoExternTy {
   uint8_t field;
@@ -22,20 +30,12 @@ struct ContainsNoExternTy {
 };
 #endif
 
-struct RenamedTy {
-  uint64_t y;
-};
-
-struct Foo {
-  int32_t x;
-};
-
 extern "C" {
 
-void no_extern_func(ContainsNoExternTy a);
-
-void renamed_func(RenamedTy a);
-
 void root(Foo a);
 
+void renamed_func(RenamedTy a);
+
+void no_extern_func(ContainsNoExternTy a);
+
 } // extern "C"

tests/expectations/static.c

@@ -9,10 +9,10 @@ typedef struct {
 
 } Foo;
 
-extern const Bar BAR;
+extern const int32_t NUMBER;
 
 extern Foo FOO;
 
-extern const int32_t NUMBER;
+extern const Bar BAR;
 
 void root(void);

tests/expectations/static.compat.c

@@ -13,11 +13,11 @@ typedef struct {
 extern "C" {
 #endif // __cplusplus
 
-extern const Bar BAR;
+extern const int32_t NUMBER;
 
 extern Foo FOO;
 
-extern const int32_t NUMBER;
+extern const Bar BAR;
 
 void root(void);
 

tests/expectations/static.cpp

@@ -12,11 +12,11 @@ struct Foo {
 
 extern "C" {
 
-extern const Bar BAR;
+extern const int32_t NUMBER;
 
 extern Foo FOO;
 
-extern const int32_t NUMBER;
+extern const Bar BAR;
 
 void root();
 

tests/expectations/swift_name.c

@@ -7,49 +7,49 @@
 
 typedef struct Opaque Opaque;
 
-typedef struct {
-  Opaque *ptr;
-} PointerToOpaque;
-
 typedef struct {
   uint8_t times;
 } SelfTypeTestStruct;
 
-PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+typedef struct {
+  Opaque *ptr;
+} PointerToOpaque;
 
-void PointerToOpaque_sayHello(PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
 
 void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
 
 void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
 
-void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
 void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
 
 SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
 
-void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
 
-void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
 
 void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
 
 void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
 
+void unnamed_argument(SelfTypeTestStruct*);
+
 void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
 
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
 
-void unnamed_argument(SelfTypeTestStruct*);
+void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
+PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+
+void PointerToOpaque_sayHello(PointerToOpaque self)
+/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));

tests/expectations/swift_name.compat.c

@@ -7,57 +7,57 @@
 
 typedef struct Opaque Opaque;
 
-typedef struct {
-  Opaque *ptr;
-} PointerToOpaque;
-
 typedef struct {
   uint8_t times;
 } SelfTypeTestStruct;
 
+typedef struct {
+  Opaque *ptr;
+} PointerToOpaque;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+
+void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
+
+void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
+
+void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
+
+SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
+
+void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+
+void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
+
+void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
+
+void unnamed_argument(SelfTypeTestStruct*);
+
+void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
+
+void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+
+void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
 PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
 
 void PointerToOpaque_sayHello(PointerToOpaque self)
 /*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
 
-void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
-
-void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
-
-void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
-
-void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
-void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
-
-SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
-
-void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
-
-void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
-
-void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
-
-void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
-
-void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
-
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
-
-void unnamed_argument(SelfTypeTestStruct*);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/swift_name.cpp

@@ -11,53 +11,53 @@ struct Box;
 
 struct Opaque;
 
-struct PointerToOpaque {
-  Opaque *ptr;
-};
-
 struct SelfTypeTestStruct {
   uint8_t times;
 };
 
+struct PointerToOpaque {
+  Opaque *ptr;
+};
+
 extern "C" {
 
+void rust_print_hello_world() CF_SWIFT_NAME(rust_print_hello_world());
+
+void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
+
+void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
+
+void SelfTypeTestStruct_should_not_exist_box(Box<SelfTypeTestStruct> self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
+
+Box<SelfTypeTestStruct> SelfTypeTestStruct_should_not_exist_return_box() CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
+
+void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+
+void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
+
+void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
+
+void unnamed_argument(SelfTypeTestStruct*);
+
+void free_function_should_not_exist_box(Box<SelfTypeTestStruct> boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
+
+void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+
+void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
 PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
 
 void PointerToOpaque_sayHello(PointerToOpaque self)
 /*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
 
-void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
-
-void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
-
-void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
-
-void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
-void SelfTypeTestStruct_should_not_exist_box(Box<SelfTypeTestStruct> self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
-
-Box<SelfTypeTestStruct> SelfTypeTestStruct_should_not_exist_return_box() CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
-
-void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
-
-void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
-
-void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
-
-void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
-
-void free_function_should_not_exist_box(Box<SelfTypeTestStruct> boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
-
-void rust_print_hello_world() CF_SWIFT_NAME(rust_print_hello_world());
-
-void unnamed_argument(SelfTypeTestStruct*);
-
 } // extern "C"

tests/expectations/tag/box.c

@@ -17,8 +17,8 @@ struct MyStruct {
   int32_t *number;
 };
 
+void root(const Foo *a, const struct MyStruct *with_box);
+
 void drop_box(int32_t *x);
 
 void drop_box_opt(int32_t *x);
-
-void root(const Foo *a, const struct MyStruct *with_box);

tests/expectations/tag/box.compat.c

@@ -21,12 +21,12 @@ struct MyStruct {
 extern "C" {
 #endif // __cplusplus
 
+void root(const Foo *a, const struct MyStruct *with_box);
+
 void drop_box(int32_t *x);
 
 void drop_box_opt(int32_t *x);
 
-void root(const Foo *a, const struct MyStruct *with_box);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/tag/constant.c

@@ -3,19 +3,28 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CAST (uint8_t)'A'
+#define FOO 10
 
 #define DELIMITER ':'
 
-#define DOUBLE_CAST (uint32_t)(float)1
+#define LEFTCURLY '{'
 
-#define EQUID U'\U00010083'
+#define QUOTE '\''
 
-#define FOO 10
+#define TAB '\t'
+
+#define NEWLINE '\n'
 
 #define HEART U'\U00002764'
 
-#define LEFTCURLY '{'
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
 
 /**
  * A
@@ -25,26 +34,17 @@
  */
 #define NEG_ONE -1
 
-#define NEWLINE '\n'
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-#define QUOTE '\''
-
 #define SHIFT 3
 
-#define TAB '\t'
-
 #define XBOOL 1
 
 #define XFALSE ((0 << SHIFT) | XBOOL)
 
 #define XTRUE (1 << (SHIFT | XBOOL))
 
-#define ZOM 3.14
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
 
 struct Foo {
   int32_t x[FOO];

tests/expectations/tag/constant.compat.c

@@ -3,19 +3,28 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CAST (uint8_t)'A'
+#define FOO 10
 
 #define DELIMITER ':'
 
-#define DOUBLE_CAST (uint32_t)(float)1
+#define LEFTCURLY '{'
 
-#define EQUID U'\U00010083'
+#define QUOTE '\''
 
-#define FOO 10
+#define TAB '\t'
+
+#define NEWLINE '\n'
 
 #define HEART U'\U00002764'
 
-#define LEFTCURLY '{'
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
 
 /**
  * A
@@ -25,26 +34,17 @@
  */
 #define NEG_ONE -1
 
-#define NEWLINE '\n'
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-#define QUOTE '\''
-
 #define SHIFT 3
 
-#define TAB '\t'
-
 #define XBOOL 1
 
 #define XFALSE ((0 << SHIFT) | XBOOL)
 
 #define XTRUE (1 << (SHIFT | XBOOL))
 
-#define ZOM 3.14
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
 
 struct Foo {
   int32_t x[FOO];

tests/expectations/tag/constant_big.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
 
 #define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
 
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
+#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+
+#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807

tests/expectations/tag/constant_big.compat.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
 
 #define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
 
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
+#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
+
+#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807

tests/expectations/tag/constant_constexpr.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CONSTANT_FLOAT32 312.292
-
 #define CONSTANT_I64 216
 
+#define CONSTANT_FLOAT32 312.292
+
 #define DELIMITER ':'
 
 #define LEFTCURLY '{'

tests/expectations/tag/constant_constexpr.compat.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define CONSTANT_FLOAT32 312.292
-
 #define CONSTANT_I64 216
 
+#define CONSTANT_FLOAT32 312.292
+
 #define DELIMITER ':'
 
 #define LEFTCURLY '{'

tests/expectations/tag/expand_features.c

@@ -7,8 +7,8 @@ struct Foo {
 
 };
 
-void cbindgen(void);
-
 void extra_debug_fn(void);
 
+void cbindgen(void);
+
 void root(struct Foo a);

tests/expectations/tag/expand_features.compat.c

@@ -11,10 +11,10 @@ struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void cbindgen(void);
-
 void extra_debug_fn(void);
 
+void cbindgen(void);
+
 void root(struct Foo a);
 
 #ifdef __cplusplus

tests/expectations/tag/extern.c

@@ -8,6 +8,6 @@ struct Normal {
   float y;
 };
 
-extern void bar(struct Normal a);
-
 extern int32_t foo(void);
+
+extern void bar(struct Normal a);

tests/expectations/tag/extern.compat.c

@@ -12,10 +12,10 @@ struct Normal {
 extern "C" {
 #endif // __cplusplus
 
-extern void bar(struct Normal a);
-
 extern int32_t foo(void);
 
+extern void bar(struct Normal a);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/tag/fns.c

@@ -11,6 +11,6 @@ struct Fns {
   int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
 };
 
-void no_return(void);
-
 void root(struct Fns _fns);
+
+void no_return(void);

tests/expectations/tag/fns.compat.c

@@ -15,10 +15,10 @@ struct Fns {
 extern "C" {
 #endif // __cplusplus
 
-void no_return(void);
-
 void root(struct Fns _fns);
 
+void no_return(void);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/tag/function_args.c

@@ -3,8 +3,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+void unnamed(const uint64_t*);
+
 void pointer_test(const uint64_t *a);
 
 void print_from_rust(void);
-
-void unnamed(const uint64_t*);

tests/expectations/tag/function_args.compat.c

@@ -7,12 +7,12 @@
 extern "C" {
 #endif // __cplusplus
 
+void unnamed(const uint64_t*);
+
 void pointer_test(const uint64_t *a);
 
 void print_from_rust(void);
 
-void unnamed(const uint64_t*);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus

tests/expectations/tag/global_variable.c

@@ -3,6 +3,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-extern const char CONST_GLOBAL_ARRAY[128];
-
 extern char MUT_GLOBAL_ARRAY[128];
+
+extern const char CONST_GLOBAL_ARRAY[128];

tests/expectations/tag/global_variable.compat.c

@@ -7,10 +7,10 @@
 extern "C" {
 #endif // __cplusplus
 
-extern const char CONST_GLOBAL_ARRAY[128];
-
 extern char MUT_GLOBAL_ARRAY[128];
 
+extern const char CONST_GLOBAL_ARRAY[128];
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus