Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update rust dependencies #15520

Merged
merged 3 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 130 additions & 105 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ lzma-rs = {version = "0.3.0", optional = true }
dasp = { version = "0.11.0", features = ["interpolate", "interpolate-linear", "signal"], optional = true }
symphonia = { version = "0.5.4", default-features = false, features = ["mp3"], optional = true }
enumset = "1.1.3"
bytemuck = "1.14.3"
bytemuck = "1.15.0"
clap = { version = "4.5.2", features = ["derive"], optional=true }
realfft = "3.3.0"
hashbrown = { version = "0.14.3", features = ["raw"] }
scopeguard = "1.2.0"
fluent-templates = "0.9.0"
fluent-templates = "0.9.1"
egui = { workspace = true, optional = true }
egui_extras = { version = "0.26.2", optional = true }
png = { version = "0.17.13", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion core/build_playerglobal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ workspace = true

[dependencies]
convert_case = "0.6.0"
proc-macro2 = "1.0.78"
proc-macro2 = "1.0.79"
quote = "1.0.35"
swf = { path = "../../swf" }
clap = {version = "4.5.2", features = ["derive"]}
Expand Down
8 changes: 4 additions & 4 deletions desktop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ dirs = "5.0"
isahc = { version = "1.7.2", features = ["cookies"] }
rfd = "0.14.0"
anyhow = "1.0"
bytemuck = "1.14.3"
bytemuck = "1.15.0"
os_info = { version = "3", default-features = false }
unic-langid = "0.9.4"
sys-locale = "0.3.1"
wgpu = { workspace = true }
futures = "0.3.30"
chrono = { version = "0.4", default-features = false, features = [] }
fluent-templates = "0.9.0"
fluent-templates = "0.9.1"
futures-lite = "2.2.0"
async-io = "2.3.1"
async-io = "2.3.2"
async-net = "2.0.0"
async-channel = "2.2.0"
toml_edit = { version = "0.22.6", features = ["parse"] }
toml_edit = { version = "0.22.7", features = ["parse"] }
gilrs = "0.10"
urlencoding = "2.1.3"

Expand Down
4 changes: 2 additions & 2 deletions desktop/src/preferences.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use ruffle_core::backend::ui::US_ENGLISH;
use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
use std::sync::{Arc, Mutex};
use sys_locale::get_locale;
use toml_edit::Document;
use toml_edit::DocumentMut;
use unic_langid::LanguageIdentifier;

/// The preferences that relate to the application itself.
Expand Down Expand Up @@ -154,7 +154,7 @@ impl GlobalPreferences {
#[derive(Default)]
struct PreferencesAndDocument {
/// The original toml document
toml_document: Document,
toml_document: DocumentMut,

/// The actual preferences stored within the toml document, as this version of Ruffle understands them.
values: SavedGlobalPreferences,
Expand Down
8 changes: 4 additions & 4 deletions desktop/src/preferences/read.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::preferences::SavedGlobalPreferences;
use std::str::FromStr;
use toml_edit::{Document, Item};
use toml_edit::{DocumentMut, Item};

#[derive(Debug, PartialEq)]
pub struct ParseResult {
Expand All @@ -23,16 +23,16 @@ impl ParseResult {
/// Default values are used wherever an unknown or invalid value is found;
/// this is to support the case of, for example, a later version having different supported
/// backends than an older version.
pub fn read_preferences(input: &str) -> (ParseResult, Document) {
pub fn read_preferences(input: &str) -> (ParseResult, DocumentMut) {
let mut result = ParseResult {
result: Default::default(),
warnings: vec![],
};
let document = match input.parse::<Document>() {
let document = match input.parse::<DocumentMut>() {
Ok(document) => document,
Err(e) => {
result.add_warning(format!("Invalid TOML: {e}"));
return (result, Document::default());
return (result, DocumentMut::default());
}
};

Expand Down
2 changes: 1 addition & 1 deletion render/naga-pixelbender/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ ruffle_render = { path = "../" }
naga = { workspace = true }
naga_oil = { workspace = true }
tracing = { workspace = true }
anyhow = "1.0.80"
anyhow = "1.0.81"
bitflags = "2.4.2"

2 changes: 1 addition & 1 deletion render/webgl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ log = "0.4"
ruffle_web_common = { path = "../../web/common" }
ruffle_render = { path = "..", features = ["tessellator", "web"] }
wasm-bindgen = "=0.2.92"
bytemuck = { version = "1.14.3", features = ["derive"] }
bytemuck = { version = "1.15.0", features = ["derive"] }
fnv = "1.0.7"
swf = { path = "../../swf" }
thiserror = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion render/wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workspace = true
wgpu = { workspace = true, features = ["naga-ir"] }
tracing = { workspace = true }
ruffle_render = { path = "..", features = ["tessellator", "wgpu"] }
bytemuck = { version = "1.14.3", features = ["derive"] }
bytemuck = { version = "1.15.0", features = ["derive"] }
raw-window-handle = "0.6.0"
clap = { version = "4.5.2", features = ["derive"], optional = true }
enum-map = "2.7.3"
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ruffle_core = { path = "../core", features = ["deterministic", "timeline_debug",
ruffle_test_framework = { path = "framework" }
libtest-mimic = "0.7.0"
walkdir = "2.5.0"
anyhow = "1.0.80"
anyhow = "1.0.81"
image = { version = "0.24.9", default-features = false, features = ["png"] }
futures = "0.3.30"
env_logger = "0.11.3"
Expand Down
6 changes: 3 additions & 3 deletions tests/framework/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ chrono = "0.4.35"
approx = "0.5.1"
pretty_assertions = "1.4.0"
serde = "1.0.197"
toml = "0.8.10"
anyhow = "1.0.80"
toml = "0.8.11"
anyhow = "1.0.81"
async-channel = "2.2.0"
vfs = "0.11.0"
vfs = "0.12.0"
percent-encoding = "2.3.1"

[features]
Expand Down
2 changes: 1 addition & 1 deletion tests/mocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version.workspace = true
workspace = true

[dependencies]
anyhow = "1.0.80"
anyhow = "1.0.81"
clap = { version = "4.5.2", features = ["derive"] }
tracing = { workspace = true}
tracing-subscriber = { workspace = true }
Expand Down