diff --git a/.github/renovate.json b/.github/renovate.json index 744b50012..c904ad789 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -6,6 +6,7 @@ "groupName": "bazel" } ], + "ignoreDeps": ["cxx.rs"], "schedule": "* * 1,15 * *", "dependencyDashboard": true } diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 118a85788..40c0de073 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -82,7 +82,7 @@ jobs: - if: matrix.renderer == 'drawable-rust' run: | echo "renderer_flag_cmake=DMLN_WITH_OPENGL=ON -DMLN_USE_RUST=ON" >> "$GITHUB_ENV" - cargo install cxxbridge-cmd --version 1.0.154 --locked + cargo install cxxbridge-cmd --version 1.0.157 --locked - if: matrix.renderer == 'drawable' run: | diff --git a/MODULE.bazel b/MODULE.bazel index 7aef664dc..838f2beda 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -71,10 +71,12 @@ darwin_config( ) bazel_dep(name = "rules_rust", version = "0.59.2") -bazel_dep(name = "cxx.rs", version = "1.0.154") +bazel_dep(name = "cxx.rs", version = "1.0.157") +# The registry is not always up to date +# See https://registry.bazel.build/modules/cxx.rs git_override( module_name = "cxx.rs", - commit = "204d76f53ab2380dd9d532795781beb51c953520", # 1.0.154 + tag = "1.0.157", remote = "https://github.com/dtolnay/cxx.git", ) diff --git a/docker/startup.sh b/docker/startup.sh index 54fc9045e..d51493baa 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -44,8 +44,7 @@ fi if ! command -v cxxbridge > /dev/null; then echo "Installing cxxbridge..." - # Attention: v1.0.154 was the last one was not causing &str passing issues - cargo install cxxbridge-cmd@1.0.154 --locked + cargo install cxxbridge-cmd@1.0.157 --locked fi diff --git a/docs/mdbook/src/rust.md b/docs/mdbook/src/rust.md index 9a7a85c35..657fdfe81 100644 --- a/docs/mdbook/src/rust.md +++ b/docs/mdbook/src/rust.md @@ -25,7 +25,7 @@ See [Platform Support](https://doc.rust-lang.org/nightly/rustc/platform-support. You also need to have cxxbridge installed: ```shell -cargo install cxxbridge-cmd@1.0.154 --locked +cargo install cxxbridge-cmd@1.0.157 --locked ``` Set `-DMLN_USE_RUST=ON` when generating a configuration with CMake. diff --git a/rustutils/Cargo.lock b/rustutils/Cargo.lock index 8c3b671a8..54578e43c 100644 --- a/rustutils/Cargo.lock +++ b/rustutils/Cargo.lock @@ -10,27 +10,27 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "cc" -version = "1.2.10" +version = "1.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" dependencies = [ "shlex", ] [[package]] name = "clap" -version = "4.5.27" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.27" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstyle", "clap_lex", @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.155" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76751bca18309cbce06f9821698d6c05b3af5c3fde8af5caf57f11611729397b" +checksum = "3d6354e975ea4ec28033ec3a36fa9baa1a02e3eb22ad740eeb4929370d4f5ba8" dependencies = [ "cc", "cxxbridge-cmd", @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "cxxbridge-cmd" -version = "1.0.155" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ce717e582fc3b56bd2f1eb3cda9916e9b4629721e4c2ce637ac5e7d4beef11" +checksum = "31860c98f69fc14da5742c5deaf78983e846c7b27804ca8c8319e32eef421bde" dependencies = [ "clap", "codespan-reporting", @@ -92,15 +92,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.155" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa7fdd4b264a3335a8b21221092bd2fbfba35c3606bd50feb28d22ba3fb0a6e5" +checksum = "b0402a66013f3b8d3d9f2d7c9994656cc81e671054822b0728d7454d9231892f" [[package]] name = "cxxbridge-macro" -version = "1.0.155" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36a0a2b78ff9232a3dc584340471d4fa1751a81026cf62f3661a06d5a8bae17" +checksum = "64c0b38f32d68f3324a981645ee39b2d686af36d03c98a386df3716108c9feae" dependencies = [ "proc-macro2", "quote", @@ -110,15 +110,15 @@ dependencies = [ [[package]] name = "foldhash" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "link-cplusplus" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +checksum = "4a6f6da007f968f9def0d65a05b187e2960183de70c160204ecfccf0ee330212" dependencies = [ "cc", ] @@ -167,18 +167,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -208,9 +208,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] name = "serde" @@ -252,9 +252,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.96" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -272,15 +272,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "winapi-util" diff --git a/rustutils/Cargo.toml b/rustutils/Cargo.toml index fb64131fa..70b5c609f 100644 --- a/rustutils/Cargo.toml +++ b/rustutils/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["staticlib"] [dependencies] csscolorparser = "0.7.0" -cxx = "1.0.154" +cxx = "1.0.157" [profile.release] lto = true diff --git a/rustutils/generate.sh b/rustutils/generate.sh index 804dfdbc2..31d75b6c5 100755 --- a/rustutils/generate.sh +++ b/rustutils/generate.sh @@ -2,7 +2,7 @@ # Run this script from the repository root # Install cxxbridge with: -# $ cargo install cxxbridge-cmd@1.0.154 --locked +# $ cargo install cxxbridge-cmd@1.0.157 --locked set -e