Further updates to version-sync

Author: Bromeon

.github/composite/godot-itest/action.yml

@@ -104,7 +104,7 @@ runs:
           echo "Default prebuilt version: $defaultVersion"
         fi
         
-        # Apply [patch] for godot4-prebuilt crate if needed.
+        # Specify `api-*` feature for godot crate if needed.
         if [[ "$PATCHED_VERSION" != $defaultVersion ]]; then
           .github/other/patch-prebuilt.sh "$PATCHED_VERSION"
         fi

godot-bindings/Cargo.toml

@@ -13,8 +13,7 @@ categories = ["game-engines", "graphics"]
 # The artifact generator explicitly excludes that though (to avoid a quasi-circular dependency back to its repo).
 [features]
 # [version-sync] [[
-#  [repeat] past
-#  [fmt] api-$kebabVersion = ["dep:prebuilt-$kebabVersion"]
+#  [line] api-$kebabVersion = ["dep:prebuilt-$kebabVersion"]
 api-4-0 = ["dep:prebuilt-4-0"]
 api-4-0-1 = ["dep:prebuilt-4-0-1"]
 api-4-0-2 = ["dep:prebuilt-4-0-2"]
@@ -25,11 +24,14 @@ api-4-1-1 = ["dep:prebuilt-4-1-1"]
 api-4-1-2 = ["dep:prebuilt-4-1-2"]
 api-4-1-3 = ["dep:prebuilt-4-1-3"]
 api-4-1-4 = ["dep:prebuilt-4-1-4"]
+api-4-2 = ["dep:prebuilt-4-2"]
+api-4-2-1 = ["dep:prebuilt-4-2-1"]
+api-4-2-2 = ["dep:prebuilt-4-2-2"]
 # ]]
 
 # [version-sync] [[
-#  [repeat] current.minor
-#  [fmt] default = ["dep:prebuilt-$kebabVersion"]
+#  [include] current.minor
+#  [line] default = ["dep:prebuilt-$kebabVersion"]
 default = ["dep:prebuilt-4-2"]
 # ]]
 
@@ -38,8 +40,7 @@ api-custom-extheader = []
 
 [dependencies]
 # [version-sync] [[
-#  [repeat] past+current
-#  [fmt] prebuilt-$kebabVersion = { optional = true, package = "godot4-prebuilt", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "$dotVersion" }
+#  [line] prebuilt-$kebabVersion = { optional = true, package = "godot4-prebuilt", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "$dotVersion" }
 prebuilt-4-0 = { optional = true, package = "godot4-prebuilt", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0" }
 prebuilt-4-0-1 = { optional = true, package = "godot4-prebuilt", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0.1" }
 prebuilt-4-0-2 = { optional = true, package = "godot4-prebuilt", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0.2" }

godot-bindings/src/import.rs

@@ -13,8 +13,8 @@
 /// All stable Godot releases _and_ upcoming next minor release.
 pub const ALL_VERSIONS: &[(u8, u8, u8)] = &[
     // [version-sync] [[
-    //  [repeat] past+current+future
-    //  [fmt] \t$triple,
+    //  [include] past+current+future
+    //  [line] \t$triple,
     (4, 0, 0),
     (4, 0, 1),
     (4, 0, 2),
@@ -33,54 +33,52 @@ pub const ALL_VERSIONS: &[(u8, u8, u8)] = &[
 ];
 
 // [version-sync] [[
-//  [repeat] past+current
-//  [fmt] #[cfg(feature = "api-$kebabVersion")]\npub use prebuilt_$snakeVersion as godot4_prebuilt;\n
+//  [line] #[cfg(feature = "api-$kebabVersion")]\npub use prebuilt_$snakeVersion as prebuilt;\n
 #[cfg(feature = "api-4-0")]
-pub use prebuilt_4_0 as godot4_prebuilt;
+pub use prebuilt_4_0 as prebuilt;
 
 #[cfg(feature = "api-4-0-1")]
-pub use prebuilt_4_0_1 as godot4_prebuilt;
+pub use prebuilt_4_0_1 as prebuilt;
 
 #[cfg(feature = "api-4-0-2")]
-pub use prebuilt_4_0_2 as godot4_prebuilt;
+pub use prebuilt_4_0_2 as prebuilt;
 
 #[cfg(feature = "api-4-0-3")]
-pub use prebuilt_4_0_3 as godot4_prebuilt;
+pub use prebuilt_4_0_3 as prebuilt;
 
 #[cfg(feature = "api-4-0-4")]
-pub use prebuilt_4_0_4 as godot4_prebuilt;
+pub use prebuilt_4_0_4 as prebuilt;
 
 #[cfg(feature = "api-4-1")]
-pub use prebuilt_4_1 as godot4_prebuilt;
+pub use prebuilt_4_1 as prebuilt;
 
 #[cfg(feature = "api-4-1-1")]
-pub use prebuilt_4_1_1 as godot4_prebuilt;
+pub use prebuilt_4_1_1 as prebuilt;
 
 #[cfg(feature = "api-4-1-2")]
-pub use prebuilt_4_1_2 as godot4_prebuilt;
+pub use prebuilt_4_1_2 as prebuilt;
 
 #[cfg(feature = "api-4-1-3")]
-pub use prebuilt_4_1_3 as godot4_prebuilt;
+pub use prebuilt_4_1_3 as prebuilt;
 
 #[cfg(feature = "api-4-1-4")]
-pub use prebuilt_4_1_4 as godot4_prebuilt;
+pub use prebuilt_4_1_4 as prebuilt;
 
 #[cfg(feature = "api-4-2")]
-pub use prebuilt_4_2 as godot4_prebuilt;
+pub use prebuilt_4_2 as prebuilt;
 
 #[cfg(feature = "api-4-2-1")]
-pub use prebuilt_4_2_1 as godot4_prebuilt;
+pub use prebuilt_4_2_1 as prebuilt;
 
 #[cfg(feature = "api-4-2-2")]
-pub use prebuilt_4_2_2 as godot4_prebuilt;
+pub use prebuilt_4_2_2 as prebuilt;
 
 // ]]
 
 // If none of the api-* features are provided, use default prebuilt version (typically latest Godot stable release).
 
 // [version-sync] [[
-//  [repeat] past+current+future
-//  [fmt] \tfeature = "api-$kebabVersion",
+//  [line] \tfeature = "api-$kebabVersion",
 //  [pre] #[cfg(not(any(
 //  [post] \tfeature = "api-custom",\n)))]
 #[cfg(not(any(
@@ -97,13 +95,12 @@ pub use prebuilt_4_2_2 as godot4_prebuilt;
     feature = "api-4-2",
     feature = "api-4-2-1",
     feature = "api-4-2-2",
-    feature = "api-4-3",
     feature = "api-custom",
 )))]
 // ]]
 
 // [version-sync] [[
-//  [repeat] current.minor
-//  [fmt] pub use prebuilt_$snakeVersion as godot4_prebuilt;
-pub use prebuilt_4_2 as godot4_prebuilt;
+//  [include] current.minor
+//  [line] pub use prebuilt_$snakeVersion as prebuilt;
+pub use prebuilt_4_2 as prebuilt;
 // ]]

godot-bindings/src/lib.rs

@@ -42,7 +42,7 @@ mod godot_version;
 
 #[cfg(feature = "api-custom")]
 #[path = ""]
-mod custom {
+mod depend_on_custom {
     use super::*;
 
     pub(crate) mod godot_exe;
@@ -68,40 +68,38 @@ mod custom {
 }
 
 #[cfg(feature = "api-custom")]
-pub use custom::*;
+pub use depend_on_custom::*;
 
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 // Prebuilt mode: Reuse existing files
 
 #[cfg(not(feature = "api-custom"))]
 #[path = ""]
-mod prebuilt {
+mod depend_on_prebuilt {
     use super::*;
-    use crate::import::godot4_prebuilt;
+    use crate::import::prebuilt;
 
     pub fn load_gdextension_json(_watch: &mut StopWatch) -> &'static str {
-        godot4_prebuilt::load_gdextension_json()
+        prebuilt::load_gdextension_json()
     }
 
     pub fn write_gdextension_headers(h_path: &Path, rs_path: &Path, watch: &mut StopWatch) {
         // Note: prebuilt artifacts just return a static str.
-        let h_contents = godot4_prebuilt::load_gdextension_header_h();
+        let h_contents = prebuilt::load_gdextension_header_h();
         std::fs::write(h_path, h_contents)
             .unwrap_or_else(|e| panic!("failed to write gdextension_interface.h: {e}"));
         watch.record("write_header_h");
 
-        let rs_contents = godot4_prebuilt::load_gdextension_header_rs();
+        let rs_contents = prebuilt::load_gdextension_header_rs();
         std::fs::write(rs_path, rs_contents)
             .unwrap_or_else(|e| panic!("failed to write gdextension_interface.rs: {e}"));
         watch.record("write_header_rs");
     }
 
     pub(crate) fn get_godot_version() -> GodotVersion {
-        let version: Vec<&str> = godot4_prebuilt::GODOT_VERSION
-            .split('.')
-            .collect::<Vec<_>>();
+        let version: Vec<&str> = prebuilt::GODOT_VERSION.split('.').collect::<Vec<_>>();
         GodotVersion {
-            full_string: godot4_prebuilt::GODOT_VERSION.into(),
+            full_string: prebuilt::GODOT_VERSION.into(),
             major: version[0].parse().unwrap(),
             minor: version[1].parse().unwrap(),
             patch: version
@@ -115,7 +113,7 @@ mod prebuilt {
 }
 
 #[cfg(not(feature = "api-custom"))]
-pub use prebuilt::*;
+pub use depend_on_prebuilt::*;
 
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 // Common
@@ -134,7 +132,7 @@ pub fn emit_godot_version_cfg() {
     let all_versions = import::ALL_VERSIONS;
 
     // Make `published_docs` #[cfg] known. This could be moved to Cargo.toml of all crates in the future.
-    println!(r#"cargo:rustc-check-cfg=published_docs"#);
+    println!(r#"cargo:rustc-check-cfg=cfg(published_docs, values(none()))"#);
 
     // Emit `rustc-check-cfg` for all minor versions (patch .0), so Cargo doesn't complain when we use the #[cfg]s.
     for (_, minor, patch) in all_versions.iter().copied() {

godot-core/Cargo.toml

@@ -15,14 +15,29 @@ codegen-lazy-fptrs = [
     "godot-ffi/codegen-lazy-fptrs",
     "godot-codegen/codegen-lazy-fptrs",
 ]
-api-custom = ["godot-ffi/api-custom", "godot-codegen/api-custom"]
 double-precision = ["godot-codegen/double-precision"]
 experimental-godot-api = ["godot-codegen/experimental-godot-api"]
 experimental-threads = ["godot-ffi/experimental-threads"]
 debug-log = ["godot-ffi/debug-log"]
 trace = []
+
+api-custom = ["godot-ffi/api-custom", "godot-codegen/api-custom"]
+# [version-sync] [[
+#  [line] api-$kebabVersion = ["godot-ffi/api-$kebabVersion"]
 api-4-0 = ["godot-ffi/api-4-0"]
+api-4-0-1 = ["godot-ffi/api-4-0-1"]
+api-4-0-2 = ["godot-ffi/api-4-0-2"]
+api-4-0-3 = ["godot-ffi/api-4-0-3"]
+api-4-0-4 = ["godot-ffi/api-4-0-4"]
 api-4-1 = ["godot-ffi/api-4-1"]
+api-4-1-1 = ["godot-ffi/api-4-1-1"]
+api-4-1-2 = ["godot-ffi/api-4-1-2"]
+api-4-1-3 = ["godot-ffi/api-4-1-3"]
+api-4-1-4 = ["godot-ffi/api-4-1-4"]
+api-4-2 = ["godot-ffi/api-4-2"]
+api-4-2-1 = ["godot-ffi/api-4-2-1"]
+api-4-2-2 = ["godot-ffi/api-4-2-2"]
+# ]]
 
 [dependencies]
 godot-ffi = { path = "../godot-ffi" }

godot-ffi/Cargo.toml

@@ -8,14 +8,29 @@ keywords = ["gamedev", "godot", "engine", "ffi"]
 categories = ["game-engines", "graphics"]
 
 [features]
-api-custom = ["godot-bindings/api-custom"]
 codegen-fmt = ["godot-codegen/codegen-fmt"]
 codegen-lazy-fptrs = ["godot-codegen/codegen-lazy-fptrs"]
 experimental-godot-api = ["godot-codegen/experimental-godot-api"]
 experimental-threads = []
 debug-log = []
+
+api-custom = ["godot-bindings/api-custom"]
+# [version-sync] [[
+#  [line] api-$kebabVersion = ["godot-bindings/api-$kebabVersion"]
 api-4-0 = ["godot-bindings/api-4-0"]
+api-4-0-1 = ["godot-bindings/api-4-0-1"]
+api-4-0-2 = ["godot-bindings/api-4-0-2"]
+api-4-0-3 = ["godot-bindings/api-4-0-3"]
+api-4-0-4 = ["godot-bindings/api-4-0-4"]
 api-4-1 = ["godot-bindings/api-4-1"]
+api-4-1-1 = ["godot-bindings/api-4-1-1"]
+api-4-1-2 = ["godot-bindings/api-4-1-2"]
+api-4-1-3 = ["godot-bindings/api-4-1-3"]
+api-4-1-4 = ["godot-bindings/api-4-1-4"]
+api-4-2 = ["godot-bindings/api-4-2"]
+api-4-2-1 = ["godot-bindings/api-4-2-1"]
+api-4-2-2 = ["godot-bindings/api-4-2-2"]
+# ]]
 
 # TODO: get rid of paste and gensym, they are trivially implementable with proc-macros. Update cargo-deny.
 # Especially gensym which pulls in entire syn for 10 LoC. See https://github.com/regiontog/gensym/blob/master/src/lib.rs.

godot/Cargo.toml

@@ -9,9 +9,6 @@ categories = ["game-engines", "graphics"]
 
 [features]
 default = ["codegen-full"]
-api-4-0 = ["godot-core/api-4-0"]
-api-4-1 = ["godot-core/api-4-1"]
-api-custom = ["godot-core/api-custom"]
 custom-godot = ["api-custom"]
 double-precision = ["godot-core/double-precision"]
 experimental-godot-api = ["godot-core/experimental-godot-api"]
@@ -21,6 +18,25 @@ formatted = ["godot-core/codegen-fmt"]
 lazy-function-tables = ["godot-core/codegen-lazy-fptrs"]
 serde = ["godot-core/serde"]
 
+api-custom = ["godot-core/api-custom"]
+# [version-sync] [[
+#  [line] api-$kebabVersion = ["godot-core/api-$kebabVersion"]
+api-4-0 = ["godot-core/api-4-0"]
+api-4-0-1 = ["godot-core/api-4-0-1"]
+api-4-0-2 = ["godot-core/api-4-0-2"]
+api-4-0-3 = ["godot-core/api-4-0-3"]
+api-4-0-4 = ["godot-core/api-4-0-4"]
+api-4-1 = ["godot-core/api-4-1"]
+api-4-1-1 = ["godot-core/api-4-1-1"]
+api-4-1-2 = ["godot-core/api-4-1-2"]
+api-4-1-3 = ["godot-core/api-4-1-3"]
+api-4-1-4 = ["godot-core/api-4-1-4"]
+api-4-2 = ["godot-core/api-4-2"]
+api-4-2-1 = ["godot-core/api-4-2-1"]
+api-4-2-2 = ["godot-core/api-4-2-2"]
+# ]]
+
+
 # Private features, they are under no stability guarantee
 codegen-full = ["godot-core/codegen-full"]
 debug-log = ["godot-core/debug-log"]

itest/repo-tweak/src/lib.rs

@@ -56,13 +56,12 @@ pub fn find_repeated_ranges(
         let after_end = end + end_pat.len();
 
         let within = &entire[start..end];
-        println!("Within: <<{within}>>");
+        // println!("Within: <<{within}>>");
 
         let mut after_keys = start;
         for key in keys {
             let key_fmt = format!("[{key}] ");
-
-            println!("  Find '{key_fmt}' -> {:?}", within.find(&key_fmt));
+            // println!("  Find '{key_fmt}' -> {:?}", within.find(&key_fmt));
 
             let Some(pos) = within.find(&key_fmt) else {
                 continue;
@@ -73,15 +72,14 @@ pub fn find_repeated_ranges(
             // Read until end of line -> that's the value.
             let eol = within[pos..]
                 .find(['\n', '\r'])
-                .expect("unterminated line for key");
+                .unwrap_or_else(|| panic!("unterminated line for key '{key}'"));
 
             let value = &within[pos..pos + eol];
             key_values.insert(key.to_string(), value.to_string());
 
             after_keys = after_keys.max(start + pos + eol);
         }
 
-        println!("Found {start}..{end}");
         found.push(Match {
             before_start,
             start: after_keys,