Merge pull request #1127 from godot-rust/qol/update-deps

Centralize + update dependencies in workspace `Cargo.toml`

Author: Bromeon

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

@@ -51,7 +51,7 @@ runs:
         fi
         
         curl "$url" -Lo artifact.zip --retry 3
-        unzip artifact.zip -d $RUNNER_DIR/godot_bin
+        unzip -q artifact.zip -d $RUNNER_DIR/godot_bin
       shell: bash
 
     - name: "Prepare Godot executable"

Cargo.toml

@@ -15,6 +15,41 @@ members = [
     "itest/hot-reload/rust",
 ]
 
+# All dependencies except own crates of this project should be specified here, independently of whether they're dev, build or
+# regular dependencies. Sort alphabetically within each section; comments about a dependency come on the section header.
+[workspace.dependencies]
+# Related to godot-rust.
+gdextension-api = { version = "0.2.2", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "releases" }
+
+# Main library features.
+glam = { version = "0.30", features = ["debug-glam-assert"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+
+# Related to tooling/build setup.
+# * regex: not used for unicode parsing -> features unicode-bool + unicode-gencat are enabled instead of unicode-perl.
+#          'unicode-gencat' needed for \d, see https://docs.rs/regex/latest/regex/#unicode-features.
+bindgen = { version = "0.71", default-features = false, features = ["runtime"] }
+libc = "0.2.172"
+regex = { version = "1.11", default-features = false, features = ["std", "unicode-bool", "unicode-gencat"] }
+which = "7"
+
+# Macros and codegen. Minimal versions compatible with -Zminimal-versions.
+# * proc_macro2: Literal::c_string() added in 1.0.80.
+# * quote: 1.0.37 allows tokenizing CStr.
+# * venial: 0.6.1 contains some bugfixes.
+heck = "0.5"
+litrs = "0.4"
+markdown = "=1.0.0-alpha.23"
+nanoserde = "0.2"
+proc-macro2 = "1.0.80"
+quote = "1.0.37"
+venial = "0.6.1"
+
+# Testing (godot-cell, itest).
+proptest = "1.6.0"
+pin-project-lite = { version = "0.2" }
+
 # Note about Jetbrains IDEs: "IDE Sync" (Refresh Cargo projects) may cause static analysis errors such as
 # "at most one `api-*` feature can be enabled". This is because by default, all Cargo features are enabled,
 # which isn't a setup we support. To address this, individual features can be enabled in the various

godot-bindings/Cargo.toml

@@ -37,18 +37,15 @@ api-custom = ["dep:bindgen", "dep:regex", "dep:which"]
 api-custom-extheader = []
 
 [dependencies]
-gdextension-api = { version = "0.2.2", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "releases" }
+gdextension-api = { workspace = true }
 
-# Do not use bindgen 0.69, it contains regression that forces recompilation of code.
-bindgen = { optional = true, version = "0.68", default-features = false, features = ["runtime"] }
-# regex >= 1.5.5 for security: https://blog.rust-lang.org/2022/03/08/cve-2022-24713.html
-# 'unicode-gencat' needed for \d, see: https://docs.rs/regex/1.5.5/regex/#unicode-features
-regex = { optional = true, version = "1.5.5", default-features = false, features = ["std", "unicode-gencat"] }
-which = { optional = true, version = "6" }
+bindgen = { workspace = true, optional = true }
+regex = { workspace = true, optional = true }
+which = { workspace = true, optional = true }
 
 [dev-dependencies]
-# For tests, we need regex unconditionally. Keep this in sync with above dependency.
-regex = { version = "1.5.5", default-features = false, features = ["std", "unicode-gencat"] }
+# For tests, we need regex unconditionally.
+regex = { workspace = true }
 
 # https://docs.rs/about/metadata
 [package.metadata.docs.rs]

godot-bindings/src/header_gen.rs

@@ -11,15 +11,21 @@ use std::path::Path;
 pub(crate) fn generate_rust_binding(in_h_path: &Path, out_rs_path: &Path) {
     let c_header_path = in_h_path.display().to_string();
 
-    // Listening to changes on files that are generated by this build step cause an infinite loop with cargo watch of
-    // build -> detect change -> rebuild -> detect change -> ...
+    // Default behavior of bindgen is to invalidate the built crate whenever any of the included header files changed. This is sensible,
+    // but in our case, listening to changes on files that are generated by this build step cause an infinite loop with cargo watch of:
+    //     build -> detect change -> rebuild -> detect change -> ...
     // println!("cargo:rerun-if-changed={}", c_header_path);
+    //
+    // Without `rerun_on_header_files(false)`, the following command causes repeated recompilation of godot-ffi onward:
+    //     cargo build -p itest --features godot/api-custom
+    //
+    // This is non-trivial to fix and isn't planned at the moment, see https://github.com/godot-rust/gdext/issues/281.
+    // If you have an idea to address this without too invasive changes, please comment on that issue.
+    let cargo_cfg = bindgen::CargoCallbacks::new().rerun_on_header_files(false);
 
     let builder = bindgen::Builder::default()
         .header(c_header_path)
-        // Tell cargo to invalidate the built crate whenever any of the
-        // included header files changed.
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        .parse_callbacks(Box::new(cargo_cfg))
         .prepend_enum_name(false);
 
     std::fs::create_dir_all(

godot-cell/Cargo.toml

@@ -14,7 +14,7 @@ homepage = "https://godot-rust.github.io"
 proptest = ["dep:proptest"]
 
 [dependencies]
-proptest = { version = "1.4.0", optional = true }
+proptest = { workspace = true, optional = true }
 
 # https://docs.rs/about/metadata
 [package.metadata.docs.rs]

godot-codegen/Cargo.toml

@@ -23,16 +23,11 @@ experimental-threads = []
 [dependencies]
 godot-bindings = { path = "../godot-bindings", version = "=0.2.4" }
 
-heck = "0.5"
-nanoserde = "0.1.35"
-
-# Minimum versions compatible with -Zminimal-versions
-proc-macro2 = "1.0.80" # Literal::c_string() added in 1.0.80.
-quote = "1.0.29"
-
-# Since we don't use Regex for unicode parsing, the features unicode-bool/unicode-gencat are used instead of unicode-perl.
-# See also https://docs.rs/regex/latest/regex/#unicode-features.
-regex = { version = "1.5.5", default-features = false, features = ["std", "unicode-bool", "unicode-gencat"] }
+heck = { workspace = true }
+nanoserde = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+regex = { workspace = true }
 
 [build-dependencies]
 godot-bindings = { path = "../godot-bindings", version = "=0.2.4" } # emit_godot_version_cfg

godot-core/Cargo.toml

@@ -45,8 +45,8 @@ api-4-4 = ["godot-ffi/api-4-4"]
 godot-ffi = { path = "../godot-ffi", version = "=0.2.4" }
 
 # See https://docs.rs/glam/latest/glam/index.html#feature-gates
-glam = { version = "0.28", features = ["debug-glam-assert"] }
-serde = { version = "1", features = ["derive"], optional = true }
+glam = { workspace = true }
+serde = { workspace = true, optional = true }
 godot-cell = { path = "../godot-cell", version = "=0.2.4" }
 
 [build-dependencies]
@@ -56,7 +56,7 @@ godot-codegen = { path = "../godot-codegen", version = "=0.2.4" }
 # Reverse dev dependencies so doctests can use `godot::` prefix.
 [dev-dependencies]
 godot = { path = "../godot", default-features = false }
-serde_json = { version = "1.0" }
+serde_json = { workspace = true }
 
 # https://docs.rs/about/metadata
 [package.metadata.docs.rs]

godot-ffi/Cargo.toml

@@ -36,7 +36,7 @@ api-4-4 = ["godot-bindings/api-4-4"]
 [dependencies]
 
 [target.'cfg(target_os = "linux")'.dependencies]
-libc = "0.2.171"
+libc = { workspace = true }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 # Only needed for WASM identifier generation.

godot-macros/Cargo.toml

@@ -20,17 +20,16 @@ register-docs = ["dep:markdown", "dep:litrs"]
 proc-macro = true
 
 [dependencies]
-# Minimum versions compatible with -Zminimal-versions
-proc-macro2 = "1.0.80" # Literal::c_string() added in 1.0.80.
-quote = "1.0.29"
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
 # Enabled by `docs`.
-markdown = { version = "=1.0.0-alpha.21", optional = true }
-litrs = { version = "0.4.1", optional = true }
-venial = "0.6.1"
+markdown = { workspace = true, optional = true }
+litrs = { workspace = true, optional = true }
+venial = { workspace = true }
 
 # Cannot use [target.'cfg(target_family = "wasm")'.dependencies], as proc-macro crates are always compiled for host platform, not target.
 # Thus solved via feature.
-libc = { version = "0.2.171", optional = true }
+libc = { workspace = true, optional = true }
 
 [build-dependencies]
 godot-bindings = { path = "../godot-bindings", version = "=0.2.4" } # emit_godot_version_cfg

itest/rust/Cargo.toml

@@ -23,15 +23,15 @@ serde = ["dep:serde", "dep:serde_json", "godot/serde"]
 
 [dependencies]
 godot = { path = "../../godot", default-features = false, features = ["__trace"] }
-serde = { version = "1", features = ["derive"], optional = true }
-serde_json = { version = "1.0", optional = true }
-pin-project-lite = { version = "0.2" }
+serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
+pin-project-lite = { workspace = true }
 
 [build-dependencies]
 godot-bindings = { path = "../../godot-bindings" } # emit_godot_version_cfg
-repo-tweak = { path = "../repo-tweak" }
 godot-codegen = { path = "../../godot-codegen" } # IS_CODEGEN_FULL
+repo-tweak = { path = "../repo-tweak" }
 
 # Minimum versions compatible with -Zminimal-versions
-proc-macro2 = "1.0.80" # Literal::c_string() added in 1.0.80.
-quote = "1.0.29"
+proc-macro2 = { workspace = true }
+quote = { workspace = true }

itest/rust/src/engine_tests/async_test.rs

@@ -160,8 +160,9 @@ fn signal_future_non_send_arg_panic() -> TaskHandle {
     handle
 }
 
+// FIXME test is flaky and occasionally breaks CI job `linux-features-experimental`. Should become deterministic, then un-skip.
 #[cfg(feature = "experimental-threads")]
-#[itest(async)]
+#[itest(async, skip)]
 fn signal_future_send_arg_no_panic() -> TaskHandle {
     use crate::framework::ThreadCrosser;