From d3365124442c4fc0ae47c8a53460238c7f2b7022 Mon Sep 17 00:00:00 2001 From: ardocrat Date: Mon, 21 Aug 2023 08:31:12 +0300 Subject: [PATCH] build: update dependencies --- Cargo.lock | 239 +++++++++++++++++++++++++++++++++++++++++++++++------ Cargo.toml | 6 +- 2 files changed, 216 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ad1384..fd6eed5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -994,7 +994,7 @@ dependencies = [ "cocoa-foundation", "core-foundation 0.9.3", "core-graphics", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -1009,7 +1009,7 @@ dependencies = [ "block", "core-foundation 0.9.3", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -1108,7 +1108,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.3", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", ] @@ -1293,6 +1293,17 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "d3d12" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +dependencies = [ + "bitflags 2.4.0", + "libloading 0.8.0", + "winapi 0.3.9", +] + [[package]] name = "dashmap" version = "5.5.0" @@ -1530,7 +1541,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu", + "wgpu 0.16.3", "winapi 0.3.9", "winit", ] @@ -1559,7 +1570,7 @@ dependencies = [ "log", "thiserror", "type-map 0.5.0", - "wgpu", + "wgpu 0.16.3", "winit", ] @@ -1857,7 +1868,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", ] [[package]] @@ -1866,6 +1898,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -2217,7 +2255,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ "bitflags 1.3.2", - "gpu-alloc-types", + "gpu-alloc-types 0.2.0", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.0", + "gpu-alloc-types 0.3.0", ] [[package]] @@ -2229,6 +2277,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.4.0", +] + [[package]] name = "gpu-allocator" version = "0.22.0" @@ -2293,10 +2350,8 @@ dependencies = [ "jni", "lazy_static", "log", - "once_cell", "openssl-sys", "pnet", - "pollster", "rand 0.8.5", "rust-i18n", "serde", @@ -2307,7 +2362,7 @@ dependencies = [ "tokio-util 0.7.8", "toml 0.7.6", "url", - "wgpu", + "wgpu 0.17.0", "winit", ] @@ -3562,11 +3617,26 @@ dependencies = [ "bitflags 1.3.2", "block", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "log", "objc", ] +[[package]] +name = "metal" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" +dependencies = [ + "bitflags 2.4.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" @@ -3694,6 +3764,26 @@ dependencies = [ "unicode-xid 0.2.4", ] +[[package]] +name = "naga" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" +dependencies = [ + "bit-set", + "bitflags 2.4.0", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits 0.2.16", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid 0.2.4", +] + [[package]] name = "native-tls" version = "0.2.11" @@ -4092,7 +4182,7 @@ checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -6593,7 +6683,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "log", - "naga", + "naga 0.12.3", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -6602,9 +6692,33 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.16.1", + "wgpu-hal 0.16.2", + "wgpu-types 0.16.1", +] + +[[package]] +name = "wgpu" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7472f3b69449a8ae073f6ec41d05b6f846902d92a6c45313c50cb25857b736ce" +dependencies = [ + "arrayvec 0.7.4", + "cfg-if 1.0.0", + "js-sys", + "log", + "naga 0.13.0", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.17.0", + "wgpu-hal 0.17.0", + "wgpu-types 0.17.0", ] [[package]] @@ -6618,7 +6732,7 @@ dependencies = [ "bitflags 2.4.0", "codespan-reporting", "log", - "naga", + "naga 0.12.3", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -6626,8 +6740,31 @@ dependencies = [ "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.16.2", + "wgpu-types 0.16.1", +] + +[[package]] +name = "wgpu-core" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecf7454d9386f602f7399225c92dd2fbdcde52c519bc8fb0bd6fbeb388075dc2" +dependencies = [ + "arrayvec 0.7.4", + "bit-vec", + "bitflags 2.4.0", + "codespan-reporting", + "log", + "naga 0.13.0", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.17.0", + "wgpu-types 0.17.0", ] [[package]] @@ -6643,10 +6780,10 @@ dependencies = [ "bitflags 2.4.0", "block", "core-graphics-types", - "d3d12", - "foreign-types", + "d3d12 0.6.0", + "foreign-types 0.3.2", "glow", - "gpu-alloc", + "gpu-alloc 0.5.4", "gpu-allocator", "gpu-descriptor", "hassle-rs", @@ -6655,8 +6792,8 @@ dependencies = [ "libc", "libloading 0.8.0", "log", - "metal", - "naga", + "metal 0.24.0", + "naga 0.12.3", "objc", "parking_lot 0.12.1", "profiling", @@ -6668,7 +6805,48 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.16.1", + "winapi 0.3.9", +] + +[[package]] +name = "wgpu-hal" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6654a13885a17f475e8324efb46dc6986d7aaaa98353330f8de2077b153d0101" +dependencies = [ + "android_system_properties", + "arrayvec 0.7.4", + "ash", + "bit-set", + "bitflags 2.4.0", + "block", + "core-graphics-types", + "d3d12 0.7.0", + "glow", + "gpu-alloc 0.6.0", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.0", + "log", + "metal 0.26.0", + "naga 0.13.0", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.17.0", "winapi 0.3.9", ] @@ -6683,6 +6861,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" +dependencies = [ + "bitflags 2.4.0", + "js-sys", + "web-sys", +] + [[package]] name = "which" version = "3.1.1" diff --git a/Cargo.toml b/Cargo.toml index d771e83..4ac9055 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,8 +33,7 @@ grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", tag = grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", tag = "v5.2.0-beta.1" } ## ui -pollster = "0.3.0" -wgpu = "0.16.1" +wgpu = "0.17.0" egui = { version = "0.22.0", default-features = false } egui_extras = { version = "0.22.0", features = ["image"] } rust-i18n = "2.1.0" @@ -42,12 +41,11 @@ rust-i18n = "2.1.0" ## other futures = "0.3" dirs = "5.0.1" -once_cell = "1.10.0" sys-locale = "0.3.0" chrono = "0.4.23" lazy_static = "1.4.0" toml = "0.7.4" -serde = "1" +serde = "1.0.170" pnet = "0.34.0" url = "2.4.0"