From 937664e737531962b1fb0fabca94f8516f947116 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Thu, 4 Apr 2024 13:32:57 +0200 Subject: [PATCH] chore: Use workspace version for bytemuck --- Cargo.toml | 1 + core/Cargo.toml | 2 +- desktop/Cargo.toml | 2 +- render/webgl/Cargo.toml | 2 +- render/wgpu/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 954fe880f..0998815ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,6 +56,7 @@ anyhow = "1.0" slotmap = "1.0.7" async-channel = "2.2.0" bitflags = "2.5.0" +bytemuck = "1.15.0" [workspace.lints.rust] # Clippy nightly often adds new/buggy lints that we want to ignore. diff --git a/core/Cargo.toml b/core/Cargo.toml index 2dc357163..f8af72591 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -48,7 +48,7 @@ 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.15.0" +bytemuck = { workspace = true } clap = { version = "4.5.4", features = ["derive"], optional=true } realfft = "3.3.0" hashbrown = { version = "0.14.3", features = ["raw"] } diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 0678661df..f8ae16fd7 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -35,7 +35,7 @@ dirs = "5.0" isahc = { version = "1.7.2", features = ["cookies"] } rfd = "0.14.1" anyhow = { workspace = true } -bytemuck = "1.15.0" +bytemuck = { workspace = true } os_info = { version = "3", default-features = false } unic-langid = "0.9.4" sys-locale = "0.3.1" diff --git a/render/webgl/Cargo.toml b/render/webgl/Cargo.toml index e4d8b76d8..bbc14d12d 100644 --- a/render/webgl/Cargo.toml +++ b/render/webgl/Cargo.toml @@ -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.15.0", features = ["derive"] } +bytemuck = { workspace = true, features = ["derive"] } swf = { path = "../../swf" } thiserror = "1.0" diff --git a/render/wgpu/Cargo.toml b/render/wgpu/Cargo.toml index a8992b64c..cca5674ae 100644 --- a/render/wgpu/Cargo.toml +++ b/render/wgpu/Cargo.toml @@ -14,7 +14,7 @@ workspace = true wgpu = { workspace = true, features = ["naga-ir"] } tracing = { workspace = true } ruffle_render = { path = "..", features = ["tessellator", "wgpu"] } -bytemuck = { version = "1.15.0", features = ["derive"] } +bytemuck = { workspace = true, features = ["derive"] } clap = { version = "4.5.4", features = ["derive"], optional = true } enum-map = "2.7.3" fnv = "1.0.7"