From 049cae3759d842dd777cfaef02131cb49ebaf878 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:52:44 +0000 Subject: [PATCH] build(deps): bump the cargo-minor group across 1 directory with 10 updates Bumps the cargo-minor group with 10 updates in the / directory: | Package | From | To | | --- | --- | --- | | [anyhow](https://github.com/dtolnay/anyhow) | `1.0.94` | `1.0.95` | | [bytemuck](https://github.com/Lokathor/bytemuck) | `1.20.0` | `1.21.0` | | [thiserror](https://github.com/dtolnay/thiserror) | `2.0.7` | `2.0.9` | | [serde_json](https://github.com/serde-rs/json) | `1.0.133` | `1.0.134` | | [fluent-templates](https://github.com/XAMPPRocky/fluent-templates) | `0.11.0` | `0.12.0` | | [png](https://github.com/image-rs/image-png) | `0.17.15` | `0.17.16` | | [syn](https://github.com/dtolnay/syn) | `2.0.90` | `2.0.91` | | [winit](https://github.com/rust-windowing/winit) | `0.30.5` | `0.30.7` | | [os_info](https://github.com/stanislav-tkach/os_info) | `3.9.0` | `3.9.1` | | [env_logger](https://github.com/rust-cli/env_logger) | `0.11.5` | `0.11.6` | Updates `anyhow` from 1.0.94 to 1.0.95 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.94...1.0.95) Updates `bytemuck` from 1.20.0 to 1.21.0 - [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md) - [Commits](https://github.com/Lokathor/bytemuck/compare/v1.20.0...v1.21.0) Updates `thiserror` from 2.0.7 to 2.0.9 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.7...2.0.9) Updates `serde_json` from 1.0.133 to 1.0.134 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.133...v1.0.134) Updates `fluent-templates` from 0.11.0 to 0.12.0 - [Release notes](https://github.com/XAMPPRocky/fluent-templates/releases) - [Changelog](https://github.com/XAMPPRocky/fluent-templates/blob/master/CHANGELOG.md) - [Commits](https://github.com/XAMPPRocky/fluent-templates/compare/fluent-templates-v0.11.0...fluent-templates-v0.12.0) Updates `png` from 0.17.15 to 0.17.16 - [Changelog](https://github.com/image-rs/image-png/blob/master/CHANGES.md) - [Commits](https://github.com/image-rs/image-png/compare/v0.17.15...v0.17.16) Updates `syn` from 2.0.90 to 2.0.91 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.90...2.0.91) Updates `winit` from 0.30.5 to 0.30.7 - [Release notes](https://github.com/rust-windowing/winit/releases) - [Changelog](https://github.com/rust-windowing/winit/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-windowing/winit/compare/v0.30.5...v0.30.7) Updates `os_info` from 3.9.0 to 3.9.1 - [Release notes](https://github.com/stanislav-tkach/os_info/releases) - [Changelog](https://github.com/stanislav-tkach/os_info/blob/master/CHANGELOG.md) - [Commits](https://github.com/stanislav-tkach/os_info/compare/v3.9.0...v3.9.1) Updates `env_logger` from 0.11.5 to 0.11.6 - [Release notes](https://github.com/rust-cli/env_logger/releases) - [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-cli/env_logger/compare/v0.11.5...v0.11.6) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor - dependency-name: bytemuck dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-minor - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor - dependency-name: fluent-templates dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-minor - dependency-name: png dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor - dependency-name: winit dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor - dependency-name: os_info dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor - dependency-name: env_logger dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 82 +++++++++---------- Cargo.toml | 4 +- core/Cargo.toml | 4 +- core/macros/Cargo.toml | 2 +- core/src/i18n.rs | 5 +- desktop/Cargo.toml | 4 +- desktop/src/gui.rs | 8 +- .../src/gui/dialogs/network_access_dialog.rs | 2 +- render/Cargo.toml | 2 +- tests/Cargo.toml | 2 +- tests/input-format/Cargo.toml | 2 +- tests/socket-format/Cargo.toml | 2 +- 12 files changed, 60 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index babade9dd481..9f537f9ad036 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "approx" @@ -478,9 +478,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.20.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" dependencies = [ "bytemuck_derive", ] @@ -1488,9 +1488,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" dependencies = [ "anstream", "anstyle", @@ -1630,7 +1630,7 @@ source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=a5e938d9bb1909095f dependencies = [ "enumset", "nom", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -1694,9 +1694,9 @@ dependencies = [ [[package]] name = "fluent-template-macros" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007d176e568a4f73ad4225df02aa29ccfecffd8eda31ce78da0bc8b4b310f20a" +checksum = "98a7b1d2fc1d7edcd008dd871aea0309be4f8ecfd4fa0388a8f261c6798ab138" dependencies = [ "flume", "ignore", @@ -1709,9 +1709,9 @@ dependencies = [ [[package]] name = "fluent-templates" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f22f61b2c8551163ea13c16a381484e5360b089401c6e47c4bfcf6b62bb7ac" +checksum = "600669b30905c0c6d69fe3bb897be7ea535b2c904c0c7a6546ada888b0542dbf" dependencies = [ "fluent-bundle", "fluent-langneg", @@ -1740,7 +1740,7 @@ name = "flv-rs" version = "0.1.0" dependencies = [ "bitflags 2.6.0", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -2194,7 +2194,7 @@ dependencies = [ "bitflags 2.6.0", "lazy_static", "num-traits", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -2614,7 +2614,7 @@ dependencies = [ "bindgen", "cc", "libc", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -3508,9 +3508,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.9.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce" +checksum = "eb6651f4be5e39563c4fe5cc8326349eb99a25d805a3493f791d5bfd0269e430" dependencies = [ "log", "windows-sys 0.52.0", @@ -3618,9 +3618,9 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.15" +version = "0.17.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d" +checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3788,7 +3788,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustls", "socket2", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tracing", ] @@ -3807,7 +3807,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.7", + "thiserror 2.0.9", "tinyvec", "tracing", "web-time", @@ -4158,7 +4158,7 @@ dependencies = [ "smallvec", "swf", "symphonia", - "thiserror 2.0.7", + "thiserror 2.0.9", "tracing", "tracy-client", "ttf-parser", @@ -4200,7 +4200,7 @@ dependencies = [ "ruffle_video_external", "ruffle_video_software", "sys-locale", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "toml_edit", "tracing", @@ -4231,7 +4231,7 @@ dependencies = [ "ruffle_render", "slotmap", "tempfile", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "toml_edit", "tracing", @@ -4288,7 +4288,7 @@ dependencies = [ "serde", "smallvec", "swf", - "thiserror 2.0.7", + "thiserror 2.0.9", "tracing", "wasm-bindgen", "wgpu", @@ -4317,7 +4317,7 @@ dependencies = [ "ruffle_render", "ruffle_web_common", "swf", - "thiserror 2.0.7", + "thiserror 2.0.9", "wasm-bindgen", "web-sys", ] @@ -4402,7 +4402,7 @@ dependencies = [ "ruffle_render", "slotmap", "swf", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -4420,7 +4420,7 @@ dependencies = [ "slotmap", "swf", "tempfile", - "thiserror 2.0.7", + "thiserror 2.0.9", "tracing", ] @@ -4439,7 +4439,7 @@ dependencies = [ "ruffle_video", "slotmap", "swf", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -4466,7 +4466,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "slotmap", - "thiserror 2.0.7", + "thiserror 2.0.9", "tracing", "tracing-log", "tracing-subscriber", @@ -4717,9 +4717,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "indexmap", "itoa", @@ -5041,9 +5041,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" dependencies = [ "proc-macro2", "quote", @@ -5151,11 +5151,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.7" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 2.0.7", + "thiserror-impl 2.0.9", ] [[package]] @@ -5171,9 +5171,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.7" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", @@ -6519,9 +6519,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.5" +version = "0.30.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" +checksum = "dba50bc8ef4b6f1a75c9274fb95aa9a8f63fbc66c56f391bd85cf68d51e7b1a3" dependencies = [ "ahash", "android-activity", @@ -6773,7 +6773,7 @@ dependencies = [ "flate2", "indexmap", "memchr", - "thiserror 2.0.7", + "thiserror 2.0.9", "zopfli", ] diff --git a/Cargo.toml b/Cargo.toml index cfb5563c9fc4..7067d8e4c263 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ anyhow = "1.0" slotmap = "1.0.7" async-channel = "2.3.1" bitflags = "2.6.0" -bytemuck = "1.20.0" +bytemuck = "1.21.0" chrono = { version = "0.4.39", default-features = false } enum-map = "2.7.3" flate2 = "1.0.35" @@ -69,7 +69,7 @@ log = "0.4" num-derive = "0.4.2" num-traits = "0.2.19" serde = "1.0.215" -thiserror = "2.0.6" +thiserror = "2.0.9" url = "2.5.2" # Make sure to match wasm-bindgen-cli version to this everywhere. wasm-bindgen = "=0.2.99" diff --git a/core/Cargo.toml b/core/Cargo.toml index 4dff4f21f155..4cb205d0310a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -53,10 +53,10 @@ clap = { workspace = true, optional=true } realfft = "3.4.0" hashbrown = { version = "0.14.5", features = ["raw"] } scopeguard = "1.2.0" -fluent-templates = "0.11.0" +fluent-templates = "0.12.0" egui = { workspace = true, optional = true } egui_extras = { version = "0.30.0", default-features = false, optional = true } -png = { version = "0.17.15", optional = true } +png = { version = "0.17.16", optional = true } flv-rs = { path = "../flv" } async-channel = { workspace = true } jpegxr = { git = "https://github.com/ruffle-rs/jpegxr", rev = "2a429b0d71ab416e10b73d4dbdcf34cfe2900395", optional = true } diff --git a/core/macros/Cargo.toml b/core/macros/Cargo.toml index 458028594aa3..3f9fa596b436 100644 --- a/core/macros/Cargo.toml +++ b/core/macros/Cargo.toml @@ -15,4 +15,4 @@ proc-macro = true [dependencies] quote = "1.0.37" -syn = { version = "2.0.90", features = ["extra-traits", "full"] } +syn = { version = "2.0.91", features = ["extra-traits", "full"] } diff --git a/core/src/i18n.rs b/core/src/i18n.rs index 0bcc989e519c..79e1c76d126e 100644 --- a/core/src/i18n.rs +++ b/core/src/i18n.rs @@ -1,5 +1,6 @@ use fluent_templates::fluent_bundle::FluentValue; use fluent_templates::{static_loader, LanguageIdentifier, Loader}; +use std::borrow::Cow; use std::collections::HashMap; static_loader! { @@ -16,10 +17,10 @@ pub fn core_text(language: &LanguageIdentifier, id: &str) -> String { }) } -pub fn core_text_with_args>( +pub fn core_text_with_args( language: &LanguageIdentifier, id: &str, - args: &HashMap, + args: &HashMap, FluentValue>, ) -> String { TEXTS .try_lookup_with_args(language, id, args) diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index cfcf56fe5416..b9725b3a1bc1 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -28,7 +28,7 @@ ruffle_frontend_utils = { path = "../frontend-utils", features = ["cpal"] } tracing = { workspace = true } tracing-subscriber = { workspace = true } tracing-appender = "0.2.3" -winit = "0.30.5" +winit = "0.30.7" webbrowser = "1.0.3" url = { workspace = true } dirs = "5.0" @@ -41,7 +41,7 @@ sys-locale = "0.3.2" wgpu = { workspace = true } futures = { workspace = true } chrono = { workspace = true } -fluent-templates = "0.11.0" +fluent-templates = "0.12.0" toml_edit = { version = "0.22.22", features = ["parse"] } gilrs = "0.11" tokio = { workspace = true, features = ["rt-multi-thread", "macros"]} diff --git a/desktop/src/gui.rs b/desktop/src/gui.rs index 819403b644d2..e6294bd658da 100644 --- a/desktop/src/gui.rs +++ b/desktop/src/gui.rs @@ -64,11 +64,11 @@ pub fn available_languages() -> Vec<&'static LanguageIdentifier> { } #[allow(dead_code)] -pub fn text_with_args<'a, T: AsRef>( +pub fn text_with_args( locale: &LanguageIdentifier, - id: &'a str, - args: &HashMap, -) -> Cow<'a, str> { + id: &'static str, + args: &HashMap, FluentValue>, +) -> Cow<'static, str> { TEXTS .try_lookup_with_args(locale, id, args) .map(Cow::Owned) diff --git a/desktop/src/gui/dialogs/network_access_dialog.rs b/desktop/src/gui/dialogs/network_access_dialog.rs index 2d85c648bdb2..d10b6e0d4af0 100644 --- a/desktop/src/gui/dialogs/network_access_dialog.rs +++ b/desktop/src/gui/dialogs/network_access_dialog.rs @@ -81,7 +81,7 @@ impl NetworkAccessDialog { locale, "network-access-dialog-port", &HashMap::from([( - "port", + "port".into(), FluentValue::String(self.config.port.to_string().into()), )]), )); diff --git a/render/Cargo.toml b/render/Cargo.toml index c07c71e82916..d81ff98c686f 100644 --- a/render/Cargo.toml +++ b/render/Cargo.toml @@ -15,7 +15,7 @@ ruffle_wstr = { path = "../wstr" } swf = { path = "../swf"} tracing = { workspace = true } gif = "0.13.1" -png = "0.17.15" +png = "0.17.16" flate2 = { workspace = true } smallvec = { version = "1.13.2", features = ["union"] } downcast-rs = "1.2.1" diff --git a/tests/Cargo.toml b/tests/Cargo.toml index fe8ba72c84e0..26bfc9a89cb3 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -34,7 +34,7 @@ walkdir = { workspace = true } anyhow = { workspace = true } image = { workspace = true, features = ["png"] } futures = { workspace = true } -env_logger = "0.11.5" +env_logger = "0.11.6" tracing = { workspace = true } tracing-subscriber = { workspace = true } diff --git a/tests/input-format/Cargo.toml b/tests/input-format/Cargo.toml index 48938c338063..8b33adcee21c 100644 --- a/tests/input-format/Cargo.toml +++ b/tests/input-format/Cargo.toml @@ -12,5 +12,5 @@ workspace = true [dependencies] serde = { workspace = true, features = ["derive"] } -serde_json = "1.0.133" +serde_json = "1.0.134" bitflags = { workspace = true } diff --git a/tests/socket-format/Cargo.toml b/tests/socket-format/Cargo.toml index d9b95d45ba34..d950b1dae636 100644 --- a/tests/socket-format/Cargo.toml +++ b/tests/socket-format/Cargo.toml @@ -12,4 +12,4 @@ workspace = true [dependencies] serde = { workspace = true, features = ["derive"] } -serde_json = "1.0.133" +serde_json = "1.0.134"