New feature rustfmt enables Rustfmt (custom formatter is default)

Author: Bromeon

godot-codegen/Cargo.toml

@@ -11,10 +11,10 @@ repository = "https://github.com/godot-rust/gdext"
 homepage = "https://godot-rust.github.io"
 
 [features]
-default = ["codegen-fmt"]
-codegen-fmt = []
+default = []
 codegen-full = []
 codegen-lazy-fptrs = []
+codegen-rustfmt = []
 double-precision = []
 api-custom = ["godot-bindings/api-custom"]
 experimental-godot-api = []

godot-codegen/src/formatter/mod.rs

@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-#![cfg(feature = "codegen-fmt")]
+#![cfg(not(feature = "codegen-rustfmt"))]
 
 use proc_macro2::{Delimiter, Spacing, TokenStream, TokenTree};
 
@@ -37,7 +37,7 @@ use proc_macro2::{Delimiter, Spacing, TokenStream, TokenTree};
 /// - anonymous function literals are a bit weird because the `|` don't have
 ///   joint spacing when they come out of a `TokenStream` and identifiers don't
 ///   have any spacing information attached, so it looks like `| arg |`.
-///   Also to know whether it's a chained bitwise or a closure would need more
+///   Also, to know whether it's a chained bitwise or, a closure would need more
 ///   information. `move | arg | x`
 /// - Because we don't keep track of what's a type and what's an expression,
 ///   generic parameters look a bit spaced out. `T < A, B >`

godot-codegen/src/lib.rs

@@ -51,16 +51,47 @@ fn write_file(path: &Path, contents: String) {
         .unwrap_or_else(|e| panic!("failed to write code file to {};\n\t{}", path.display(), e));
 }
 
-#[cfg(feature = "codegen-fmt")]
+#[cfg(not(feature = "codegen-rustfmt"))]
 fn submit_fn(path: PathBuf, tokens: TokenStream) {
     write_file(&path, formatter::format_tokens(tokens));
 }
 
-#[cfg(not(feature = "codegen-fmt"))]
-fn submit_fn(path: PathBuf, tokens: TokenStream) {
-    write_file(&path, tokens.to_string());
+#[cfg(feature = "codegen-rustfmt")]
+mod rustfmt {
+    use super::*;
+    use std::process::Command;
+    use std::sync::Mutex;
+
+    pub fn submit_fn(path: PathBuf, tokens: TokenStream) {
+        write_file(&path, tokens.to_string());
+        FILES_TO_RUSTFMT.lock().unwrap().push(path);
+    }
+
+    pub fn rustfmt_files() {
+        let out_files = FILES_TO_RUSTFMT.lock().unwrap();
+        println!("Format {} generated files...", out_files.len());
+
+        for files in out_files.chunks(20) {
+            let mut command = Command::new("rustfmt");
+            for file in files {
+                command.arg(file);
+            }
+
+            let status = command.status().expect("failed to invoke rustfmt");
+            if !status.success() {
+                panic!("rustfmt failed on {:?}", command);
+            }
+        }
+
+        println!("Rustfmt completed successfully");
+    }
+
+    static FILES_TO_RUSTFMT: Mutex<Vec<PathBuf>> = Mutex::new(Vec::new());
 }
 
+#[cfg(feature = "codegen-rustfmt")]
+pub(crate) use rustfmt::*;
+
 pub fn generate_sys_files(
     sys_gen_path: &Path,
     h_path: &Path,
@@ -99,6 +130,12 @@ pub fn generate_sys_files(
 
     generate_sys_module_file(sys_gen_path, &mut submit_fn);
     watch.record("generate_module_file");
+
+    #[cfg(feature = "codegen-rustfmt")]
+    {
+        rustfmt_files();
+        watch.record("rustfmt");
+    }
 }
 
 pub fn generate_core_files(core_gen_path: &Path) {
@@ -151,5 +188,11 @@ pub fn generate_core_files(core_gen_path: &Path) {
     );
     watch.record("generate_native_structures_files");
 
+    #[cfg(feature = "codegen-rustfmt")]
+    {
+        rustfmt_files();
+        watch.record("rustfmt");
+    }
+
     watch.write_stats_to(&core_gen_path.join("codegen-stats.txt"));
 }

godot-core/Cargo.toml

@@ -12,7 +12,7 @@ homepage = "https://godot-rust.github.io"
 
 [features]
 default = []
-codegen-fmt = ["godot-ffi/codegen-fmt", "godot-codegen/codegen-fmt"]
+codegen-rustfmt = ["godot-ffi/codegen-rustfmt", "godot-codegen/codegen-rustfmt"]
 codegen-full = ["godot-codegen/codegen-full"]
 codegen-lazy-fptrs = [
     "godot-ffi/codegen-lazy-fptrs",

godot-ffi/Cargo.toml

@@ -11,7 +11,7 @@ repository = "https://github.com/godot-rust/gdext"
 homepage = "https://godot-rust.github.io"
 
 [features]
-codegen-fmt = ["godot-codegen/codegen-fmt"]
+codegen-rustfmt = ["godot-codegen/codegen-rustfmt"]
 codegen-lazy-fptrs = ["godot-codegen/codegen-lazy-fptrs"]
 experimental-godot-api = ["godot-codegen/experimental-godot-api"]
 experimental-threads = []

godot/Cargo.toml

@@ -19,7 +19,7 @@ double-precision = ["godot-core/double-precision"]
 experimental-godot-api = ["godot-core/experimental-godot-api"]
 experimental-threads = ["godot-core/experimental-threads"]
 experimental-wasm = []
-formatted = ["godot-core/codegen-fmt"]
+rustfmt = ["godot-core/codegen-rustfmt"]
 lazy-function-tables = ["godot-core/codegen-lazy-fptrs"]
 serde = ["godot-core/serde"]
 

godot/src/lib.rs

@@ -102,7 +102,7 @@
 //!   to explicitly opt in to any instabilities or rough edges that may result. Due to a limitation in Godot, it might currently not
 //!   work Firefox browser.<br><br>
 //!
-//! * **`formatted`**
+//! * **`rustfmt`**
 //!
 //!   Use rustfmt to format generated binding code. Because rustfmt is so slow, this is detrimental to initial compile time.
 //!   Without it, we use a lightweight and fast custom formatter to enable basic human readability.