Merge pull request #734 from godot-rust/qol/no-fmt-crate

Integrate `godot-fmt` crate into `godot-codegen`

Author: Bromeon

Cargo.toml

@@ -13,9 +13,6 @@ members = [
     "itest/rust",
     "examples/dodge-the-creeps/rust",
     "examples/hot-reload/rust",
-
-    # utils
-    "godot-fmt",
 ]
 
 #[patch."https://github.com/godot-rust/godot4-prebuilt"]

godot-codegen/Cargo.toml

@@ -18,7 +18,6 @@ experimental-godot-api = []
 
 [dependencies]
 godot-bindings = { path = "../godot-bindings" }
-godot-fmt = { path = "../godot-fmt" }
 
 heck = "0.4"
 nanoserde = "0.1.35"
@@ -38,3 +37,14 @@ godot-bindings = { path = "../godot-bindings" } # emit_godot_version_cfg
 [package.metadata.docs.rs]
 features = ["experimental-godot-api"]
 rustdoc-args = ["--cfg", "published_docs"]
+
+
+# To check formatter: Disabled below, since it pulls in too many dependencies during `cargo test` but is not really used.
+# Dev-dependencies cannot be optional and feature-gated. Enable manually when needed.
+
+#[[bench]]
+#name = "gdext_fmt_bench"
+#harness = false
+#
+#[dev-dependencies]
+#criterion = "0.5"

godot-fmt/benches/gdext_bench.rs renamed to godot-codegen/src/formatter/benches/gdext_fmt_bench.rs

@@ -19,7 +19,9 @@ pub fn criterion_benchmark(c: &mut Criterion) {
     let test_cases_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .parent()
         .unwrap()
-        .join("godot-fmt")
+        .join("godot-codegen")
+        .join("src")
+        .join("formatter")
         .join("test-cases");
 
     for dir_entry in std::fs::read_dir(test_cases_dir).unwrap() {

godot-fmt/src/lib.rs renamed to godot-codegen/src/formatter/mod.rs

@@ -10,6 +10,7 @@
 
 mod context;
 mod conv;
+mod formatter;
 mod generator;
 mod models;
 mod special_cases;
@@ -47,7 +48,7 @@ fn write_file(path: &Path, contents: String) {
 
 #[cfg(feature = "codegen-fmt")]
 fn submit_fn(path: PathBuf, tokens: TokenStream) {
-    write_file(&path, godot_fmt::format_tokens(tokens));
+    write_file(&path, formatter::format_tokens(tokens));
 }
 
 #[cfg(not(feature = "codegen-fmt"))]