commit e629c6453a3171b60feeaf2e47e492abc810c981
author David Tolnay <dtolnay@gmail.com> Sat Oct 31 22:02:09 2020 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Oct 31 22:56:02 2020 -0700
tree eaa80f1cd08ff71fef0bab083e9a3134cea54d2b
parent fd68e562fa83ab772046c3432747a0db4bc6bb05

Defer writing builtins until after main content

gen/src/write.rs

diff --git a/gen/src/write.rs b/gen/src/write.rs
index 1b30446..9696a49 100644
--- a/gen/src/write.rs
+++ b/gen/src/write.rs
@@ -18,6 +18,7 @@
         writeln!(out.include, "#pragma once");
     }
 
+    pick_includes_and_builtins(out, apis);
     out.include.extend(&opt.include);
     for api in apis {
         if let Api::Include(include) = api {
@@ -25,11 +26,6 @@
         }
     }
 
-    pick_includes_and_builtins(out, apis);
-    write_builtins(out);
-
-    out.next_section();
-
     let apis_by_namespace = NamespaceEntries::new(apis);
 
     gen_namespace_forward_declarations(out, &apis_by_namespace);
@@ -40,6 +36,7 @@
         write_generic_instantiations(out);
     }
 
+    write_builtins(out);
     write_includes(out);
 
     out_file