liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(deps): update rust dependencies to v2

This commit is contained in:
renovate[bot] 2023-11-20 02:13:27 +00:00 committed by TÖRÖK Attila
parent 2a83274c7f
commit 7757d060ff
6 changed files with 42 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Cargo.lock generated
View File

@ -268,23 +268,16 @@ dependencies = [
]
[[package]]
name = "async-io"
version = "1.13.0"
name = "async-channel"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e"
dependencies = [
"async-lock 2.8.0",
"autocfg",
"cfg-if",
"concurrent-queue",
"futures-lite 1.13.0",
"log",
"parking",
"polling 2.8.0",
"rustix 0.37.25",
"slab",
"socket2",
"waker-fn",
"event-listener 3.1.0",
"event-listener-strategy",
"futures-core",
"pin-project-lite",
]
[[package]]
@ -300,7 +293,7 @@ dependencies = [
"futures-lite 2.0.1",
"parking",
"polling 3.2.0",
"rustix 0.38.19",
"rustix",
"slab",
"tracing",
"waker-fn",
@ -329,13 +322,13 @@ dependencies = [
[[package]]
name = "async-net"
version = "1.8.0"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f"
checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
dependencies = [
"async-io 1.13.0",
"async-io",
"blocking",
"futures-lite 1.13.0",
"futures-lite 2.0.1",
]
[[package]]
@ -494,7 +487,7 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
dependencies = [
"async-channel",
"async-channel 1.9.0",
"async-lock 2.8.0",
"async-task",
"fastrand 2.0.1",
@ -1926,7 +1919,11 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb"
dependencies = [
"fastrand 2.0.1",
"futures-core",
"futures-io",
"memchr",
"parking",
"pin-project-lite",
]
@ -2539,17 +2536,6 @@ dependencies = [
"unic-langid",
]
[[package]]
name = "io-lifetimes"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi",
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "is-terminal"
version = "0.4.9"
@ -2557,7 +2543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
"rustix 0.38.19",
"rustix",
"windows-sys 0.48.0",
]
@ -2567,7 +2553,7 @@ version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
dependencies = [
"async-channel",
"async-channel 1.9.0",
"castaway",
"crossbeam-utils",
"curl",
@ -2836,12 +2822,6 @@ dependencies = [
"syn 2.0.39",
]
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
version = "0.4.10"
@ -3604,9 +3584,9 @@ dependencies = [
[[package]]
name = "parking"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
@ -3742,7 +3722,7 @@ dependencies = [
"cfg-if",
"concurrent-queue",
"pin-project-lite",
"rustix 0.38.19",
"rustix",
"tracing",
"windows-sys 0.48.0",
]
@ -4128,7 +4108,7 @@ dependencies = [
name = "ruffle_core"
version = "0.1.0"
dependencies = [
"async-channel",
"async-channel 2.1.0",
"bitflags 2.4.1",
"bitstream-io",
"build_playerglobal",
@ -4189,8 +4169,8 @@ version = "0.1.0"
dependencies = [
"anyhow",
"arboard",
"async-channel",
"async-io 2.2.0",
"async-channel 2.1.0",
"async-io",
"async-net",
"bytemuck",
"chrono",
@ -4205,7 +4185,7 @@ dependencies = [
"fluent-templates",
"fontdb",
"futures",
"futures-lite 1.13.0",
"futures-lite 2.0.1",
"generational-arena",
"image",
"isahc",
@ -4374,7 +4354,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"approx",
"async-channel",
"async-channel 2.1.0",
"chrono",
"env_logger",
"futures",
@ -4427,7 +4407,7 @@ dependencies = [
name = "ruffle_web"
version = "0.1.0"
dependencies = [
"async-channel",
"async-channel 2.1.0",
"base64",
"chrono",
"console_error_panic_hook",
@ -4523,20 +4503,6 @@ dependencies = [
"version_check",
]
[[package]]
name = "rustix"
version = "0.37.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
dependencies = [
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys 0.3.8",
"windows-sys 0.48.0",
]
[[package]]
name = "rustix"
version = "0.38.19"
@ -4546,7 +4512,7 @@ dependencies = [
"bitflags 2.4.1",
"errno",
"libc",
"linux-raw-sys 0.4.10",
"linux-raw-sys",
"windows-sys 0.48.0",
]
@ -4773,7 +4739,7 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
dependencies = [
"async-channel",
"async-channel 1.9.0",
"futures-core",
"futures-io",
]
@ -5898,7 +5864,7 @@ dependencies = [
"either",
"home",
"once_cell",
"rustix 0.38.19",
"rustix",
]
[[package]]

2
core/Cargo.toml
View File

@ -55,7 +55,7 @@ egui = { workspace = true, optional = true }
egui_extras = { version = "0.23.0", optional = true }
png = { version = "0.17.10", optional = true }
flv-rs = { path = "../flv" }
async-channel = "1.9.0"
async-channel = "2.1.0"
jpegxr = { git = "https://github.com/ruffle-rs/jpegxr", branch = "ruffle", optional = true }
image = { version = "0.24.7", default-features = false, features = ["tiff", "dxt"] }

6
core/src/socket.rs
View File

@ -155,7 +155,11 @@ impl<'gc> Sockets<'gc> {
pub fn send(&mut self, handle: SocketHandle, data: Vec<u8>) {
if let Some(Socket { sender, .. }) = self.sockets.get_mut(handle) {
let _ = sender.borrow().send_blocking(data);
// We use an unbounded socket, so this should only ever error if the channel is closed
// (the receiver was dropped)
if let Err(e) = sender.borrow().try_send(data) {
tracing::error!("Failed to send data to socket: {:?}", e);
}
}
}

6
desktop/Cargo.toml
View File

@ -39,10 +39,10 @@ wgpu = { workspace = true }
futures = "0.3.29"
chrono = { version = "0.4", default-features = false, features = [] }
fluent-templates = "0.8.0"
futures-lite = "1.13.0"
futures-lite = "2.0.1"
async-io = "2.2.0"
async-net = "1.8.0"
async-channel = "1.9.0"
async-net = "2.0.0"
async-channel = "2.1.0"
# Deliberately held back to match tracy client used by profiling crate
tracing-tracy = { version = "=0.10.2", optional = true }

2
tests/framework/Cargo.toml
View File

@ -26,7 +26,7 @@ tracing-subscriber = { workspace = true }
serde = "1.0.192"
toml = "0.8.8"
anyhow = "1.0.75"
async-channel = "1.9.0"
async-channel = "2.1.0"
vfs = "0.10.0"
percent-encoding = "2.3.0"

2
web/Cargo.toml
View File

@ -50,7 +50,7 @@ getrandom = { version = "0.2", features = ["js"] }
serde = { version = "1.0.192", features = ["derive"] }
thiserror = "1.0"
base64 = "0.21.5"
async-channel = "1.9.0"
async-channel = "2.1.0"
futures-util = { version = "0.3.29", features = ["sink"] }
gloo-net = { version = "0.4.0", default-features = false, features = ["websocket"] }
#TODO: change when fix released