From f7ada701e5e41a93cb7d0f5489e8fbf27d01c860 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Tue, 9 Jul 2024 04:08:28 -0700 Subject: [PATCH] Reorganize cargo dependencies and upgrade most of them (#1815) * Reorganize cargo dependencies and upgrade most * cargo update * Attempt 2 * Polishing changes * Comment out specta typescript flag-dependent code * Fix test --- Cargo.lock | 1359 +++++++++-------- Cargo.toml | 96 +- editor/Cargo.toml | 38 +- editor/src/generate_ts_types.rs | 36 +- frontend/src-tauri/Cargo.toml | 46 +- frontend/src-tauri/src/main.rs | 3 +- frontend/wasm/Cargo.toml | 31 +- libraries/bezier-rs/Cargo.toml | 6 +- libraries/dyn-any/Cargo.toml | 23 +- libraries/dyn-any/derive/Cargo.toml | 2 + libraries/raw-rs/Cargo.toml | 26 +- libraries/raw-rs/tag-derive/Cargo.toml | 5 +- node-graph/compilation-client/Cargo.toml | 24 +- node-graph/compilation-server/Cargo.toml | 25 +- node-graph/gcore/Cargo.toml | 48 +- node-graph/gcore/src/raster/image.rs | 2 +- node-graph/gpu-compiler/Cargo.toml | 20 +- .../gpu-compiler-bin-wrapper/Cargo.toml | 13 +- node-graph/gpu-executor/Cargo.toml | 8 +- node-graph/graph-craft/Cargo.toml | 11 +- node-graph/graph-craft/src/proto.rs | 12 +- node-graph/graphene-cli/Cargo.toml | 44 +- node-graph/gstd/Cargo.toml | 67 +- node-graph/gstd/src/imaginate.rs | 4 +- node-graph/interpreted-executor/Cargo.toml | 14 +- node-graph/node-macro/Cargo.toml | 5 +- node-graph/vulkan-executor/Cargo.toml | 13 +- node-graph/wgpu-executor/Cargo.toml | 19 +- proc-macros/Cargo.toml | 11 +- website/other/bezier-rs-demos/wasm/Cargo.toml | 5 +- 30 files changed, 1042 insertions(+), 974 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6da019d7..f5f88a5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "ab_glyph" -version = "0.2.26" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -89,7 +89,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni 0.21.1", @@ -124,6 +124,55 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.86" @@ -330,7 +379,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -359,13 +408,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -418,38 +467,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.29", - "itoa 1.0.11", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "tokio", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.7.5" @@ -457,13 +474,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core", "bytes", "futures-util", "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.0", "hyper-util", "itoa 1.0.11", "matchit", @@ -484,23 +501,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.3" @@ -611,18 +611,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] [[package]] name = "bitstream-io" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" [[package]] name = "block" @@ -719,9 +719,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] @@ -734,7 +734,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -782,7 +782,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "polling", "rustix", @@ -814,9 +814,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" dependencies = [ "jobserver", "libc", @@ -871,6 +871,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -883,14 +889,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -941,6 +947,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + [[package]] name = "colored" version = "1.9.4" @@ -1002,7 +1014,7 @@ dependencies = [ "gpu-executor", "graph-craft", "graphene-core", - "reqwest", + "reqwest 0.12.5", "serde_json", ] @@ -1011,7 +1023,7 @@ name = "compilation-server" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.5", + "axum", "futures", "gpu-compiler-bin-wrapper", "graph-craft", @@ -1090,6 +1102,15 @@ dependencies = [ "libc", ] +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -1191,7 +1212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1201,7 +1222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1216,8 +1237,8 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading 0.8.4", "winapi", ] @@ -1242,7 +1263,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1253,7 +1274,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1291,20 +1312,20 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.70", ] [[package]] @@ -1344,24 +1365,13 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "dlib" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading 0.8.4", ] [[package]] @@ -1378,7 +1388,7 @@ checksum = "d05213e96f184578b5f70105d4d0a644a168e99e12d7bea0b200c15d67b5c182" dependencies = [ "futures", "rand 0.8.5", - "reqwest", + "reqwest 0.11.27", "thiserror", "tokio", ] @@ -1420,14 +1430,14 @@ dependencies = [ "dyn-any", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embed-resource" @@ -1482,20 +1492,30 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1690,7 +1710,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1804,7 +1824,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -2157,7 +2177,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2167,7 +2187,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2201,7 +2221,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown 0.14.5", ] @@ -2212,7 +2232,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2220,7 +2240,7 @@ name = "gpu-executor" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "bytemuck", "dyn-any", "futures", @@ -2238,7 +2258,7 @@ dependencies = [ name = "graph-craft" version = "0.1.0" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bezier-rs", "bytemuck", "dyn-any", @@ -2246,7 +2266,7 @@ dependencies = [ "graphene-core", "log", "num-traits", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "specta", ] @@ -2256,7 +2276,7 @@ name = "graphene-cli" version = "0.1.0" dependencies = [ "bezier-rs", - "bitflags 2.5.0", + "bitflags 2.6.0", "chrono", "dyn-any", "fern", @@ -2266,7 +2286,7 @@ dependencies = [ "graph-craft", "graphene-core", "graphene-std", - "image 0.24.9", + "image 0.25.1", "interpreted-executor", "log", "serde", @@ -2281,12 +2301,12 @@ dependencies = [ name = "graphene-core" version = "0.1.0" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bezier-rs", "bytemuck", "dyn-any", "glam", - "image 0.24.9", + "image 0.25.1", "js-sys", "kurbo 0.11.0 (git+https://github.com/linebender/kurbo.git)", "log", @@ -2295,7 +2315,7 @@ dependencies = [ "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", - "rustybuzz 0.10.0", + "rustybuzz 0.17.0", "serde", "specta", "spirv-std", @@ -2310,7 +2330,7 @@ name = "graphene-std" version = "0.1.0" dependencies = [ "autoquant", - "base64 0.21.7", + "base64 0.22.1", "bezier-rs", "bytemuck", "compilation-client", @@ -2322,16 +2342,16 @@ dependencies = [ "gpu-executor", "graph-craft", "graphene-core", - "image 0.24.9", + "image 0.25.1", "image-compare", "js-sys", "log", "node-macro", "rand 0.8.5", "rand_chacha 0.3.1", - "reqwest", + "reqwest 0.12.5", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "tokio", @@ -2352,7 +2372,7 @@ dependencies = [ name = "graphite-desktop" version = "0.1.0" dependencies = [ - "axum 0.6.20", + "axum", "chrono", "fern", "futures", @@ -2371,7 +2391,7 @@ name = "graphite-editor" version = "0.0.0" dependencies = [ "bezier-rs", - "bitflags 2.5.0", + "bitflags 2.6.0", "derivative", "dyn-any", "env_logger", @@ -2382,11 +2402,11 @@ dependencies = [ "graphene-core", "graphene-std", "graphite-proc-macros", - "image 0.24.9", + "image 0.25.1", "interpreted-executor", "js-sys", "log", - "num_enum 0.6.1", + "num_enum 0.7.2", "once_cell", "serde", "serde_json", @@ -2408,7 +2428,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -2516,6 +2536,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -2548,10 +2587,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading 0.8.4", "thiserror", "widestring", "winapi", @@ -2584,6 +2623,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -2683,9 +2728,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -2709,7 +2754,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2725,13 +2770,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -2740,20 +2786,25 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", + "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 0.2.12", - "hyper 0.14.29", + "http 1.1.0", + "hyper 1.4.0", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", ] [[package]] @@ -2770,18 +2821,39 @@ dependencies = [ ] [[package]] -name = "hyper-util" -version = "0.1.5" +name = "hyper-tls" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", + "hyper 1.4.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.3.1", + "hyper 1.4.0", "pin-project-lite", + "socket2", "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2828,124 +2900,6 @@ dependencies = [ "objc2 0.4.1", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2954,14 +2908,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -2989,9 +2941,7 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "jpeg-decoder", "num-traits", - "png", ] [[package]] @@ -3005,15 +2955,17 @@ dependencies = [ "num-traits", "png", "tiff", + "zune-core", + "zune-jpeg", ] [[package]] name = "image-compare" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16b73efbb4b417b4e036cb6f0b0d31c43568a90ab575a4c7611c4396ec1a6b8" +checksum = "96cd73af13ae2e7220a1c02fe7d6bb53be50612ba7fabbb5c88e7753645f1f3c" dependencies = [ - "image 0.24.9", + "image 0.25.1", "itertools", "rayon", "thiserror", @@ -3095,16 +3047,22 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.52.0", ] [[package]] -name = "itertools" -version = "0.10.5" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -3197,9 +3155,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3222,7 +3180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading 0.8.4", "pkg-config", ] @@ -3277,7 +3235,7 @@ dependencies = [ [[package]] name = "kurbo" version = "0.11.0" -source = "git+https://github.com/linebender/kurbo.git#d6791b454049b3fe81bb27fef7b0c0564aa4a9fe" +source = "git+https://github.com/linebender/kurbo.git#c9843e8d4a6cd376922c827055eeb43e653f14d0" dependencies = [ "arrayvec", "serde", @@ -3286,9 +3244,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -3308,12 +3266,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3347,7 +3305,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -3358,28 +3316,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linux-raw-sys" version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "lock_api" version = "0.4.12" @@ -3392,9 +3338,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loom" @@ -3486,9 +3432,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d8b92cd8358e8d229c11df9358decae64d137c5be540952c5ca7b25aea768" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3523,7 +3469,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3556,9 +3502,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -3582,14 +3528,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "codespan-reporting", "hexf-parse", "indexmap 2.2.6", "log", "num-traits", "petgraph", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3676,7 +3622,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", @@ -3733,9 +3679,21 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", "libc", "memoffset 0.9.1", ] @@ -3746,7 +3704,7 @@ version = "0.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -3810,9 +3768,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -3842,7 +3800,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -3892,7 +3850,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -3905,15 +3863,6 @@ dependencies = [ "num_enum_derive 0.5.11", ] -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - [[package]] name = "num_enum" version = "0.7.2" @@ -3935,18 +3884,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "num_enum_derive" version = "0.7.2" @@ -3956,7 +3893,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4021,7 +3958,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4037,7 +3974,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation", @@ -4073,7 +4010,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4085,7 +4022,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation", @@ -4097,7 +4034,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation", @@ -4124,9 +4061,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4153,7 +4090,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -4170,7 +4107,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4239,11 +4176,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.21.1", + "ttf-parser 0.24.0", ] [[package]] @@ -4295,9 +4232,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4442,7 +4379,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4495,7 +4432,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4529,14 +4466,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", - "quick-xml", + "quick-xml 0.32.0", "serde", "time", ] @@ -4556,13 +4492,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.1" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -4644,9 +4580,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4666,6 +4602,71 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 1.1.0", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash 1.1.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -4853,11 +4854,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -4932,12 +4933,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.29", - "hyper-rustls", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -4946,8 +4946,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -4955,7 +4954,6 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", "tokio-util", "tower-service", "url", @@ -4963,10 +4961,58 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", "winreg 0.50.0", ] +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.0", + "hyper-rustls", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.52.0", +] + [[package]] name = "resvg" version = "0.39.0" @@ -5010,9 +5056,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" dependencies = [ "bytemuck", ] @@ -5039,7 +5085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -5062,6 +5108,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -5077,7 +5129,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5086,14 +5138,16 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ - "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] @@ -5106,12 +5160,29 @@ dependencies = [ ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pemfile" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -5123,32 +5194,33 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" -version = "0.10.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "bytemuck", "smallvec", - "ttf-parser 0.19.2", - "unicode-bidi-mirroring", - "unicode-ccc", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", "unicode-properties", "unicode-script", ] [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "23288ca94acc914c882928fe4fae313ebaa58aa55400f2b08f2c4b01538e3464" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", + "core_maths", "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring", - "unicode-ccc", + "ttf-parser 0.24.0", + "unicode-bidi-mirroring 0.3.0", + "unicode-ccc 0.3.0", "unicode-properties", "unicode-script", ] @@ -5161,9 +5233,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] @@ -5198,21 +5270,11 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", @@ -5227,7 +5289,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -5275,9 +5337,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -5295,20 +5357,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "indexmap 2.2.6", "itoa 1.0.11", @@ -5334,7 +5396,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -5360,9 +5422,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ "base64 0.22.1", "chrono", @@ -5378,14 +5440,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -5589,7 +5651,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", @@ -5657,21 +5719,19 @@ dependencies = [ [[package]] name = "specta" -version = "2.0.0-rc.12" -source = "git+https://github.com/oscartbeaumont/specta.git#d1bfae8fd885d597164df39523c871d45c327184" +version = "2.0.0-rc.13" +source = "git+https://github.com/oscartbeaumont/specta.git#24978230d01be0daec984bced3fe2a64ebd92fba" dependencies = [ "glam", - "once_cell", "paste", - "serde", "specta-macros", "thiserror", ] [[package]] name = "specta-macros" -version = "2.0.0-rc.10" -source = "git+https://github.com/oscartbeaumont/specta.git#d1bfae8fd885d597164df39523c871d45c327184" +version = "2.0.0-rc.13" +source = "git+https://github.com/oscartbeaumont/specta.git#24978230d01be0daec984bced3fe2a64ebd92fba" dependencies = [ "Inflector", "proc-macro2", @@ -5691,7 +5751,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5784,6 +5844,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "svg_fmt" version = "0.4.3" @@ -5813,9 +5879,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -5834,17 +5900,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "sys-locale" version = "0.2.4" @@ -5910,7 +5965,7 @@ name = "tag-derive" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -5990,15 +6045,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "tauri" -version = "1.6.8" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" +checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" dependencies = [ "anyhow", "bytes", @@ -6028,7 +6083,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle 0.5.2", "regex", - "reqwest", + "reqwest 0.11.27", "rfd", "semver", "serde", @@ -6055,9 +6110,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" dependencies = [ "anyhow", "cargo_toml", @@ -6074,9 +6129,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" +checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" dependencies = [ "base64 0.21.7", "brotli", @@ -6100,9 +6155,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" +checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -6114,9 +6169,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" +checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" dependencies = [ "gtk", "http 0.2.12", @@ -6135,9 +6190,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" +checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" dependencies = [ "arboard", "cocoa", @@ -6156,9 +6211,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" dependencies = [ "brotli", "ctor", @@ -6200,7 +6255,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml", + "quick-xml 0.31.0", "windows 0.56.0", "windows-version", ] @@ -6271,7 +6326,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6352,21 +6407,11 @@ dependencies = [ "strict-num", ] -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -6404,7 +6449,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6419,11 +6464,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -6470,7 +6516,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.15", ] [[package]] @@ -6508,9 +6554,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap 2.2.6", "serde", @@ -6541,7 +6587,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "http 1.1.0", "http-body 1.0.0", @@ -6583,7 +6629,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -6645,12 +6691,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "ttf-parser" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" - [[package]] name = "ttf-parser" version = "0.20.0" @@ -6659,9 +6699,12 @@ checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] name = "ttf-parser" -version = "0.21.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" +dependencies = [ + "core_maths", +] [[package]] name = "typenum" @@ -6692,18 +6735,39 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +[[package]] +name = "unicode-bidi-mirroring" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" + [[package]] name = "unicode-ccc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +[[package]] +name = "unicode-ccc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-properties" version = "0.1.1" @@ -6748,9 +6812,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -6792,22 +6856,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "utf16_iter" -version = "1.0.5" +name = "utf8parse" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", ] @@ -6903,7 +6961,7 @@ name = "vulkan-executor" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "bytemuck", "dyn-any", "glam", @@ -6974,9 +7032,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6984,24 +7042,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -7011,9 +7069,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7021,22 +7079,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -7053,9 +7111,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" dependencies = [ "cc", "downcast-rs", @@ -7067,11 +7125,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "rustix", "wayland-backend", "wayland-scanner", @@ -7083,16 +7141,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2" dependencies = [ "rustix", "wayland-client", @@ -7105,7 +7163,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7117,7 +7175,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7130,7 +7188,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7139,20 +7197,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.34.0", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" dependencies = [ "dlib", "log", @@ -7162,9 +7220,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -7229,9 +7287,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "webview2-com" @@ -7285,7 +7346,7 @@ checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" dependencies = [ "arrayvec", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "js-sys", "log", "naga", @@ -7310,8 +7371,8 @@ checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", - "cfg_aliases", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "indexmap 2.2.6", "log", @@ -7320,7 +7381,7 @@ dependencies = [ "parking_lot", "profiling", "raw-window-handle 0.6.2", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "web-sys", @@ -7333,7 +7394,7 @@ name = "wgpu-executor" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "bytemuck", "dyn-any", "futures", @@ -7362,9 +7423,9 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-graphics-types", "d3d12", "glow", @@ -7376,7 +7437,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading 0.8.4", "log", "metal", "naga", @@ -7388,7 +7449,7 @@ dependencies = [ "range-alloc", "raw-window-handle 0.6.2", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -7403,7 +7464,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -7414,16 +7475,16 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] [[package]] name = "wide" -version = "0.7.24" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8" +checksum = "2caba658a80831539b30698ae9862a72db6697dfdd7151e46920f5f2755c3ce2" dependencies = [ "bytemuck", "safe_arch", @@ -7509,7 +7570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7519,7 +7580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ "windows-core 0.56.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7538,7 +7599,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7550,7 +7611,7 @@ dependencies = [ "windows-implement 0.56.0", "windows-interface", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7571,7 +7632,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7582,7 +7643,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -7597,7 +7658,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7639,7 +7700,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7674,18 +7735,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -7700,7 +7761,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7717,9 +7778,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -7747,9 +7808,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -7777,15 +7838,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -7813,9 +7874,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -7843,9 +7904,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -7861,9 +7922,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -7891,9 +7952,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -7904,10 +7965,10 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "calloop", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-foundation", "core-graphics 0.23.2", "cursor-icon", @@ -8001,18 +8062,6 @@ dependencies = [ "wayland-protocols-wlr", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "wry" version = "0.24.10" @@ -8081,7 +8130,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading 0.8.4", "once_cell", "rustix", "x11rb-protocol", @@ -8126,7 +8175,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -8151,35 +8200,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - [[package]] name = "zbus" -version = "4.2.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-executor", @@ -8197,7 +8222,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.28.0", + "nix 0.29.0", "ordered-stream", "rand 0.8.5", "serde", @@ -8215,14 +8240,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "zvariant_utils", ] @@ -8239,72 +8264,50 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] -name = "zerofrom" -version = "0.1.4" +name = "zeroize" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] -name = "zerofrom-derive" -version = "0.1.4" +name = "zune-core" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] -name = "zerovec" -version = "0.10.2" +name = "zune-jpeg" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", + "zune-core", ] [[package]] name = "zvariant" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ "endi", "enumflags2", @@ -8315,14 +8318,14 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "zvariant_utils", ] @@ -8334,5 +8337,5 @@ checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] diff --git a/Cargo.toml b/Cargo.toml index a4ed553e..9ae69682 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,83 +22,89 @@ members = [ "libraries/raw-rs/tag-derive", "website/other/bezier-rs-demos/wasm", ] -resolver = "2" exclude = ["node-graph/gpu-compiler"] +resolver = "2" [workspace.dependencies] -specta = { git = "https://github.com/oscartbeaumont/specta.git", features = [ - "glam", - "typescript", -] } -rustc-hash = "1.1.0" -# wasm-bindgen upgrades may break various things so we pin the version -wasm-bindgen = "=0.2.91" +# Local dependencies dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam"] } graphene-core = { path = "node-graph/gcore" } graph-craft = { path = "node-graph/graph-craft", features = ["serde"] } -spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu.git" } +bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any"] } +node-macro = { path = "node-graph/node-macro" } + +# Workspace dependencies +rustc-hash = "2.0" bytemuck = { version = "1.13", features = ["derive"] } -async-trait = { version = "0.1" } +async-trait = "0.1" serde = { version = "1.0", features = ["derive", "rc"] } serde_json = "1.0" -reqwest = { version = "0.11", features = ["rustls", "rustls-tls", "json"] } +serde-wasm-bindgen = "0.6" +reqwest = { version = "0.12", features = ["blocking", "rustls-tls", "json"] } futures = "0.3" -log = { version = "0.4" } +env_logger = "0.11" +log = "0.4" bitflags = { version = "2.4", features = ["serde"] } -derivative = "2.2.0" -tempfile = "3" +derivative = "2.2" +tempfile = "3.6" thiserror = "1.0" -anyhow = "1.0.66" +anyhow = "1.0" proc-macro2 = "1" -syn = { version = "2.0", default-features = false, features = ["full", "derive"] } quote = "1.0" -axum = "0.6" -chrono = "^0.4.23" +axum = "0.7" +chrono = "0.4" ron = "0.8" -fastnoise-lite = "1.1.0" +fastnoise-lite = "1.1" +spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu.git" } wgpu-types = "0.17" wgpu = "0.19" -wasm-bindgen-futures = { version = "0.4.36" } +once_cell = "1.13" # Remove when `core::cell::LazyCell` () is stabilized in Rust 1.80 and we bump our MSRV +wasm-bindgen = "=0.2.92" # wasm-bindgen upgrades may break various things so we pin the version +wasm-bindgen-futures = "0.4" +js-sys = "=0.3.69" +web-sys = "=0.3.69" winit = "0.29" -url = "2.4.0" +url = "2.5" tokio = { version = "1.29", features = ["fs", "io-std"] } -vello = { version = "0.1.0" } -resvg = { version = "0.39" } -rand = { version = "0.8.5", default-features = false } -rand_chacha = { version = "0.3.1" } -bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any"] } +vello = "0.1" +resvg = "0.39" +usvg = "0.39" +rand = { version = "0.8", default-features = false } +rand_chacha = "0.3" +glam = { version = "0.25", default-features = false, features = ["serde"] } +base64 = "0.22" +image = { version = "0.25", default-features = false, features = ["png"] } +rustybuzz = "0.17" +meval = "0.2" +spirv = "0.3" +fern = { version = "0.6", features = ["colored"] } +num_enum = "0.7" +num-derive = "0.4" +num-traits = { version = "0.2", default-features = false, features = ["i128"] } +specta = { git = "https://github.com/oscartbeaumont/specta.git", features = [ + "glam", + # "typescript", +] } +syn = { version = "2.0", default-features = false, features = [ + "full", + "derive", +] } kurbo = { git = "https://github.com/linebender/kurbo.git", features = [ "serde", ] } -glam = { version = "0.25", default-features = false, features = ["serde"] } -node-macro = { path = "node-graph/node-macro" } -base64 = { version = "0.21" } -image = { version = "0.24", default-features = false, features = ["png"] } -rustybuzz = { version = "0.10.0" } -num-derive = { version = "0.4" } -num-traits = { version = "0.2.15", default-features = false, features = [ - "i128", -] } -js-sys = { version = "=0.3.67" } -web-sys = { version = "=0.3.67" } -usvg = "0.39" -spirv = "0.3" -fern = { version = "0.6", features = ["colored"] } [profile.dev.package.graphite-editor] opt-level = 1 -# This is a mitigation for https://github.com/rustwasm/wasm-pack/issues/981 -# Which is needed because the node_registry function is too large -[profile.dev.package.interpreted-executor] -opt-level = 1 - [profile.dev.package.graphene-core] opt-level = 1 [profile.dev.package.graphene-std] opt-level = 1 +[profile.dev.package.interpreted-executor] +opt-level = 1 # This is a mitigation for https://github.com/rustwasm/wasm-pack/issues/981 which is needed because the node_registry function is too large + [profile.dev.package.autoquant] opt-level = 3 diff --git a/editor/Cargo.toml b/editor/Cargo.toml index a44db38c..29c98ff3 100644 --- a/editor/Cargo.toml +++ b/editor/Cargo.toml @@ -2,7 +2,7 @@ name = "graphite-editor" publish = false version = "0.0.0" -rust-version = "1.66.0" +rust-version = "1.70.0" authors = ["Graphite Authors "] edition = "2021" readme = "../README.md" @@ -12,6 +12,7 @@ license = "Apache-2.0" [features] default = ["wasm"] +wasm = ["wasm-bindgen", "graphene-std/wasm", "wasm-bindgen-futures"] gpu = [ "interpreted-executor/gpu", "graphene-std/gpu", @@ -23,34 +24,31 @@ quantization = [ "graphene-std/quantization", "interpreted-executor/quantization", ] -wasm = ["wasm-bindgen", "graphene-std/wasm", "wasm-bindgen-futures"] [dependencies] -js-sys = "0.3.67" +# Local dependencies +graphite-proc-macros = { path = "../proc-macros" } +graph-craft = { path = "../node-graph/graph-craft" } +interpreted-executor = { path = "../node-graph/interpreted-executor" } +graphene-core = { path = "../node-graph/gcore" } +graphene-std = { path = "../node-graph/gstd", features = ["serde"] } + +# Workspace dependencies +js-sys = { workspace = true } log = { workspace = true } bitflags = { workspace = true } thiserror = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -graphite-proc-macros = { path = "../proc-macros" } bezier-rs = { workspace = true } glam = { workspace = true, features = ["serde", "debug-glam-assert"] } derivative = { workspace = true } specta.workspace = true image = { workspace = true, features = ["bmp", "png"] } -graph-craft = { path = "../node-graph/graph-craft" } -wgpu-executor = { path = "../node-graph/wgpu-executor", optional = true } -gpu-executor = { path = "../node-graph/gpu-executor", optional = true } -interpreted-executor = { path = "../node-graph/interpreted-executor" } dyn-any = { workspace = true } -graphene-core = { path = "../node-graph/gcore" } -graphene-std = { path = "../node-graph/gstd", features = ["serde"] } -num_enum = "0.6.1" +num_enum = { workspace = true } usvg = { workspace = true } -wasm-bindgen = { workspace = true, optional = true } -wasm-bindgen-futures = { workspace = true, optional = true } -# Remove when `core::cell::LazyCell` is stabilized () -once_cell = "1.13.0" +once_cell = { workspace = true } web-sys = { workspace = true, features = [ "Document", "DomRect", @@ -60,9 +58,17 @@ web-sys = { workspace = true, features = [ "TextMetrics", ] } +# Optional local dependencies +wgpu-executor = { path = "../node-graph/wgpu-executor", optional = true } +gpu-executor = { path = "../node-graph/gpu-executor", optional = true } + +# Optional workspace dependencies +wasm-bindgen = { workspace = true, optional = true } +wasm-bindgen-futures = { workspace = true, optional = true } [dev-dependencies] -env_logger = "0.10" +# Workspace dependencies +env_logger = { workspace = true } futures = { workspace = true } tokio = { workspace = true, features = ["rt", "macros"] } diff --git a/editor/src/generate_ts_types.rs b/editor/src/generate_ts_types.rs index 391a3fc7..659b860f 100644 --- a/editor/src/generate_ts_types.rs +++ b/editor/src/generate_ts_types.rs @@ -4,29 +4,31 @@ #[ignore] #[test] fn generate_ts_types() { - use crate::messages::prelude::FrontendMessage; - use specta::ts::{export_named_datatype, BigIntExportBehavior, ExportConfig}; - use specta::{NamedType, TypeMap}; - use std::fs::File; - use std::io::Write; + // TODO: Un-comment this out when we figure out how to reenable the "typescript` Specta feature flag - let config = ExportConfig::new().bigint(BigIntExportBehavior::Number); + // use crate::messages::prelude::FrontendMessage; + // use specta::ts::{export_named_datatype, BigIntExportBehavior, ExportConfig}; + // use specta::{NamedType, TypeMap}; + // use std::fs::File; + // use std::io::Write; - let mut type_map = TypeMap::default(); + // let config = ExportConfig::new().bigint(BigIntExportBehavior::Number); - let datatype = FrontendMessage::definition_named_data_type(&mut type_map); + // let mut type_map = TypeMap::default(); - let mut export = String::new(); + // let datatype = FrontendMessage::definition_named_data_type(&mut type_map); - export += &export_named_datatype(&config, &datatype, &type_map).unwrap(); + // let mut export = String::new(); - type_map - .iter() - .map(|(_, v)| v) - .flat_map(|v| export_named_datatype(&config, v, &type_map)) - .for_each(|e| export += &format!("\n\n{e}")); + // export += &export_named_datatype(&config, &datatype, &type_map).unwrap(); - let mut file = File::create("../types.ts").unwrap(); + // type_map + // .iter() + // .map(|(_, v)| v) + // .flat_map(|v| export_named_datatype(&config, v, &type_map)) + // .for_each(|e| export += &format!("\n\n{e}")); - write!(file, "{export}").ok(); + // let mut file = File::create("../types.ts").unwrap(); + + // write!(file, "{export}").ok(); } diff --git a/frontend/src-tauri/Cargo.toml b/frontend/src-tauri/Cargo.toml index 439d9f63..d2fd6fa6 100644 --- a/frontend/src-tauri/Cargo.toml +++ b/frontend/src-tauri/Cargo.toml @@ -7,24 +7,26 @@ license = "Apache-2.0" repository = "" default-run = "graphite-desktop" edition = "2021" -rust-version = "1.66.0" +rust-version = "1.70.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[build-dependencies] -tauri-build = { version = "1.2", features = [] } +[features] +# by default Tauri runs in production mode +# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL +default = ["custom-protocol"] +# this feature is used for production builds where `devPath` points to the filesystem +# DO NOT remove this +custom-protocol = ["tauri/custom-protocol"] +gpu = ["graphite-editor/gpu"] +quantization = ["graphite-editor/quantization"] [dependencies] +# Local dependencies +graphite-editor = { path = "../../editor" } + +# Workspace dependencies serde_json = { workspace = true } serde = { workspace = true } -tauri = { version = "1.5", features = [ - "api-all", - "devtools", - "linux-protocol-headers", - "wry", -] } axum = { workspace = true } -graphite-editor = { path = "../../editor" } chrono = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } ron = { workspace = true } @@ -32,12 +34,14 @@ log = { workspace = true } fern = { workspace = true } futures = { workspace = true } -[features] -gpu = ["graphite-editor/gpu"] -quantization = ["graphite-editor/quantization"] -# by default Tauri runs in production mode -# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL -default = ["custom-protocol"] -# this feature is used for production builds where `devPath` points to the filesystem -# DO NOT remove this -custom-protocol = ["tauri/custom-protocol"] +# Required dependencies +tauri = { version = "1.5", features = [ + "api-all", + "devtools", + "linux-protocol-headers", + "wry", +] } + +[build-dependencies] +# Required dependencies +tauri-build = { version = "1.2", features = [] } diff --git a/frontend/src-tauri/src/main.rs b/frontend/src-tauri/src/main.rs index ae5efc6f..4f8bea41 100644 --- a/frontend/src-tauri/src/main.rs +++ b/frontend/src-tauri/src/main.rs @@ -61,7 +61,8 @@ async fn main() { // run it with hyper on localhost:3000 tauri::async_runtime::spawn(async { - axum::Server::bind(&"0.0.0.0:3001".parse().unwrap()).serve(app.into_make_service()).await.unwrap(); + let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap(); + axum::serve(listener, app).await.unwrap(); }); tauri::Builder::default() diff --git a/frontend/wasm/Cargo.toml b/frontend/wasm/Cargo.toml index e6aa1edc..b41bd59d 100644 --- a/frontend/wasm/Cargo.toml +++ b/frontend/wasm/Cargo.toml @@ -2,7 +2,7 @@ name = "graphite-wasm" publish = false version = "0.0.0" -rust-version = "1.66.0" +rust-version = "1.70.0" authors = ["Graphite Authors "] edition = "2021" readme = "../../README.md" @@ -11,39 +11,42 @@ repository = "https://github.com/GraphiteEditor/Graphite" license = "Apache-2.0" [features] -tauri = ["ron"] -gpu = ["editor/gpu"] default = ["gpu"] +gpu = ["editor/gpu"] +tauri = ["ron"] [lib] crate-type = ["cdylib", "rlib"] [dependencies] +# Local dependencies editor = { path = "../../editor", package = "graphite-editor" } + +# Workspace dependencies graph-craft = { workspace = true } log = { workspace = true } graphene-core = { workspace = true, features = ["std", "alloc"] } serde = { workspace = true, features = ["derive"] } wasm-bindgen = { workspace = true } -serde-wasm-bindgen = "0.6" +serde-wasm-bindgen = { workspace = true } js-sys = { workspace = true } wasm-bindgen-futures = { workspace = true } -ron = { workspace = true, optional = true } bezier-rs = { workspace = true } glam = { workspace = true } -# We don't have wgpu on multiple threads (yet) https://github.com/gfx-rs/wgpu/blob/trunk/CHANGELOG.md#wgpu-types-now-send-sync-on-wasm -wgpu = { workspace = true, features = ["fragile-send-sync-non-atomic-wasm"] } -meval = "0.2.0" - -[dependencies.web-sys] -workspace = true -features = [ +meval = { workspace = true } +wgpu = { workspace = true, features = [ + "fragile-send-sync-non-atomic-wasm", +] } # We don't have wgpu on multiple threads (yet) https://github.com/gfx-rs/wgpu/blob/trunk/CHANGELOG.md#wgpu-types-now-send-sync-on-wasm +web-sys = { workspace = true, features = [ "Window", "CanvasRenderingContext2d", "Document", "HtmlCanvasElement", - "IdleRequestOptions" -] + "IdleRequestOptions", +] } + +# Optional workspace dependencies +ron = { workspace = true, optional = true } [package.metadata.wasm-pack.profile.dev] wasm-opt = false diff --git a/libraries/bezier-rs/Cargo.toml b/libraries/bezier-rs/Cargo.toml index 9b8889e9..74807257 100644 --- a/libraries/bezier-rs/Cargo.toml +++ b/libraries/bezier-rs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bezier-rs" version = "0.4.0" -rust-version = "1.66.0" +rust-version = "1.70.0" edition = "2021" authors = ["Graphite Authors "] description = "Computational geometry algorithms for Bézier segments and shapes useful in the context of 2D graphics" @@ -14,8 +14,12 @@ repository = "https://github.com/GraphiteEditor/Graphite/tree/master/libraries/b documentation = "https://graphite.rs/libraries/bezier-rs/" [dependencies] +# Required dependencies glam = { version = "0.25", features = ["serde"] } +# Optional local dependencies dyn-any = { version = "0.3.0", path = "../dyn-any", optional = true } + +# Optional workspace dependencies serde = { workspace = true, optional = true } log = { workspace = true, optional = true } diff --git a/libraries/dyn-any/Cargo.toml b/libraries/dyn-any/Cargo.toml index dcca3979..1faaa2b1 100644 --- a/libraries/dyn-any/Cargo.toml +++ b/libraries/dyn-any/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dyn-any" version = "0.3.1" -rust-version = "1.66.0" +rust-version = "1.70.0" edition = "2021" authors = ["Graphite Authors "] description = "An Any trait that works for arbitrary lifetimes" @@ -11,22 +11,25 @@ homepage = "https://graphite.rs/libraries/dyn-any" repository = "https://github.com/GraphiteEditor/Graphite/tree/master/libraries/dyn-any" documentation = "https://docs.rs/dyn-any" -[dependencies] -dyn-any-derive = { path = "derive", version = "0.3.0", optional = true } -log = { version = "0.4", optional = true } -glam = { version = "0.25", optional = true, default-features = false } - [features] +default = ["std", "large-atomics"] +std = ["alloc", "rc", "glam/default"] +large-atomics = [] +alloc = [] derive = ["dyn-any-derive"] log-bad-types = ["log"] # Opt into impls for Rc and Arc. rc = [] # Opt into impls for some glam types glam = ["dep:glam"] -alloc = [] -large-atomics = [] -std = ["alloc", "rc", "glam/default"] -default = ["std", "large-atomics"] + +[dependencies] +# Optional local dependencies +dyn-any-derive = { path = "derive", optional = true } + +# Optional dependencies +log = { version = "0.4", optional = true } +glam = { version = "0.25", optional = true, default-features = false } [package.metadata.docs.rs] all-features = true diff --git a/libraries/dyn-any/derive/Cargo.toml b/libraries/dyn-any/derive/Cargo.toml index c35b57aa..cf1025a3 100644 --- a/libraries/dyn-any/derive/Cargo.toml +++ b/libraries/dyn-any/derive/Cargo.toml @@ -14,6 +14,7 @@ readme = "../README.md" proc-macro = true [dependencies] +# Workspace dependencies proc-macro2 = { workspace = true } quote = { workspace = true } syn = { workspace = true, default-features = false, features = [ @@ -25,4 +26,5 @@ syn = { workspace = true, default-features = false, features = [ ] } [dev-dependencies] +# Local dependencies dyn-any = { path = "..", features = ["derive"] } diff --git a/libraries/raw-rs/Cargo.toml b/libraries/raw-rs/Cargo.toml index 4e0657e8..c21ff780 100644 --- a/libraries/raw-rs/Cargo.toml +++ b/libraries/raw-rs/Cargo.toml @@ -12,15 +12,21 @@ homepage = "https://github.com/GraphiteEditor/Graphite/tree/master/libraries/raw repository = "https://github.com/GraphiteEditor/Graphite/tree/master/libraries/raw-rs" documentation = "https://docs.rs/raw-rs" -[dependencies] -bitstream-io = "2.3.0" -num_enum = "0.7.2" -thiserror = { workspace = true } -tag-derive = { path = "tag-derive" } -libraw-rs = { version = "0.0.4", optional = true } - -[dev-dependencies] -downloader = "0.2.7" - [features] raw-rs-tests = ["libraw-rs"] + +[dependencies] +# Local dependencies +tag-derive = { path = "tag-derive" } + +# Required dependencies +bitstream-io = "2.3.0" +num_enum = "0.7.2" +thiserror = "1.0" + +# Optional dependencies +libraw-rs = { version = "0.0.4", optional = true } # Should be a dev dependency, but Cargo currently doesn't allow optional dev dependencies + +[dev-dependencies] +# Required dependencies +downloader = "0.2.7" diff --git a/libraries/raw-rs/tag-derive/Cargo.toml b/libraries/raw-rs/tag-derive/Cargo.toml index fc129202..df3a0db3 100644 --- a/libraries/raw-rs/tag-derive/Cargo.toml +++ b/libraries/raw-rs/tag-derive/Cargo.toml @@ -12,5 +12,6 @@ repository = "https://github.com/GraphiteEditor/Graphite/tree/master/libraries/r proc-macro = true [dependencies] -quote.workspace = true -syn.workspace = true +# Workspace dependencies +quote = { workspace = true } +syn = { workspace = true } diff --git a/node-graph/compilation-client/Cargo.toml b/node-graph/compilation-client/Cargo.toml index fde94267..0673780c 100644 --- a/node-graph/compilation-client/Cargo.toml +++ b/node-graph/compilation-client/Cargo.toml @@ -4,22 +4,14 @@ version = "0.1.0" edition = "2021" license = "MIT OR Apache-2.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -#tokio = { version = "1.0", features = ["full"] } -serde_json = "1.0" -graph-craft = { version = "0.1.0", path = "../graph-craft", features = [ - "serde", -] } +# Local dependencies +graph-craft = { path = "../graph-craft", features = ["serde"] } +gpu-executor = { path = "../gpu-executor" } +gpu-compiler-bin-wrapper = { path = "../gpu-compiler/gpu-compiler-bin-wrapper" } + +# Workspace dependencies graphene-core = { workspace = true } -gpu-executor = { version = "0.1.0", path = "../gpu-executor" } -gpu-compiler-bin-wrapper = { version = "0.1.0", path = "../gpu-compiler/gpu-compiler-bin-wrapper" } anyhow = { workspace = true } -reqwest = { version = "0.11", features = [ - "blocking", - "serde_json", - "json", - "rustls", - "rustls-tls", -] } +serde_json = { workspace = true } +reqwest = { workspace = true, features = ["blocking", "json", "rustls-tls"] } diff --git a/node-graph/compilation-server/Cargo.toml b/node-graph/compilation-server/Cargo.toml index fe61ec52..97d312d3 100644 --- a/node-graph/compilation-server/Cargo.toml +++ b/node-graph/compilation-server/Cargo.toml @@ -4,18 +4,17 @@ version = "0.1.0" edition = "2021" license = "MIT OR Apache-2.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -tokio = { version = "1", features = ["full"] } -axum = "0.7" -serde_json = "1.0" -graph-craft = { version = "0.1.0", path = "../graph-craft", features = [ - "serde", -] } -gpu-compiler-bin-wrapper = { version = "0.1.0", path = "../gpu-compiler/gpu-compiler-bin-wrapper" } -serde = { version = "1.0", features = ["derive"] } -tempfile = "3.6.0" -anyhow = "1.0.72" -futures = "0.3" +# Local dependencies +graph-craft = { path = "../graph-craft", features = ["serde"] } +gpu-compiler-bin-wrapper = { path = "../gpu-compiler/gpu-compiler-bin-wrapper" } +tokio = { workspace = true, features = ["full"] } +axum = { workspace = true } +serde_json = { workspace = true } +serde = { workspace = true, features = ["derive"] } +tempfile = { workspace = true } +anyhow = { workspace = true } +futures = { workspace = true } + +# Required dependencies tower-http = { version = "0.5", features = ["cors"] } diff --git a/node-graph/gcore/Cargo.toml b/node-graph/gcore/Cargo.toml index c6866f0d..13da9697 100644 --- a/node-graph/gcore/Cargo.toml +++ b/node-graph/gcore/Cargo.toml @@ -6,9 +6,14 @@ description = "API definitions for Graphene" authors = ["Graphite Authors "] license = "MIT OR Apache-2.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [features] +default = ["serde", "kurbo", "log", "std", "rand_chacha", "wasm"] +log = ["dep:log"] +gpu = ["spirv-std", "glam/bytemuck", "dyn-any", "glam/libm"] +nightly = [] +alloc = ["dyn-any", "bezier-rs"] +type_id_logging = [] +wasm = ["web-sys"] std = [ "dyn-any", "dyn-any/std", @@ -19,8 +24,6 @@ std = [ "rustybuzz", "image", ] -default = ["serde", "kurbo", "log", "std", "rand_chacha", "wasm"] -log = ["dep:log"] serde = [ "dep:serde", "glam/serde", @@ -28,44 +31,45 @@ serde = [ "bezier-rs/serde", "base64", ] -gpu = ["spirv-std", "glam/bytemuck", "dyn-any", "glam/libm"] -nightly = [] -alloc = ["dyn-any", "bezier-rs"] -type_id_logging = [] -wasm = ["web-sys"] [dependencies] +# Workspace dependencies +bytemuck = { workspace = true, features = ["derive"] } +node-macro = { workspace = true } +num-derive = { workspace = true } +num-traits = { workspace = true, default-features = false, features = ["i128"] } +usvg = { workspace = true } +rand = { workspace = true, default-features = false, features = ["std_rng"] } +glam = { workspace = true, default-features = false, features = [ + "scalar-math", +] } + +# Optional workspace dependencies dyn-any = { workspace = true, optional = true } spirv-std = { workspace = true, optional = true } -bytemuck = { workspace = true, features = ["derive"] } serde = { workspace = true, optional = true, features = ["derive"] } log = { workspace = true, optional = true } rand_chacha = { workspace = true, optional = true } bezier-rs = { workspace = true, optional = true } kurbo = { workspace = true, optional = true } -glam = { workspace = true, default-features = false, features = [ - "scalar-math", -] } -node-macro = { workspace = true } base64 = { workspace = true, optional = true } -image = { workspace = true, optional = true, default-features = false, features = [ - "png", -] } specta = { workspace = true, optional = true } rustybuzz = { workspace = true, optional = true } -num-derive = { workspace = true } -num-traits = { workspace = true, default-features = false, features = ["i128"] } wasm-bindgen = { workspace = true, optional = true } js-sys = { workspace = true, optional = true } web-sys = { workspace = true, optional = true, features = [ "HtmlCanvasElement", ] } -usvg = { workspace = true } -rand = { workspace = true, default-features = false, features = ["std_rng"] } +image = { workspace = true, optional = true, default-features = false, features = [ + "png", +] } [dev-dependencies] +# Workspace dependencies tokio = { workspace = true, features = ["rt", "macros"] } [lints.rust] # the spirv target is not in the list of common cfgs so must be added manually -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_arch, values("spirv"))'] } +unexpected_cfgs = { level = "warn", check-cfg = [ + 'cfg(target_arch, values("spirv"))', +] } diff --git a/node-graph/gcore/src/raster/image.rs b/node-graph/gcore/src/raster/image.rs index 0ea19c71..593763fc 100644 --- a/node-graph/gcore/src/raster/image.rs +++ b/node-graph/gcore/src/raster/image.rs @@ -151,7 +151,7 @@ impl Image { let (data, width, height) = self.to_flat_u8(); let mut png = Vec::new(); let encoder = ::image::codecs::png::PngEncoder::new(&mut png); - encoder.write_image(&data, width, height, ::image::ColorType::Rgba8).expect("failed to encode image as png"); + encoder.write_image(&data, width, height, ::image::ExtendedColorType::Rgba8).expect("failed to encode image as png"); png } } diff --git a/node-graph/gpu-compiler/Cargo.toml b/node-graph/gpu-compiler/Cargo.toml index ab0b047a..abfe0194 100644 --- a/node-graph/gpu-compiler/Cargo.toml +++ b/node-graph/gpu-compiler/Cargo.toml @@ -9,25 +9,29 @@ default = [] profiling = ["nvtx"] serde = ["graphene-core/serde", "glam/serde"] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -graphene-core = { workspace = true, features = ["async", "std", "alloc"] } +# Local dependencies graph-craft = { path = "../graph-craft", features = ["serde"] } gpu-executor = { path = "../gpu-executor" } + +# Workspace dependencies +graphene-core = { workspace = true, features = ["async", "std", "alloc"] } dyn-any = { workspace = true, features = ["log-bad-types", "rc", "glam"] } num-traits = { workspace = true } log = { workspace = true } serde = { workspace = true } glam = { workspace = true } base64 = { workspace = true } - bytemuck = { workspace = true } -nvtx = { version = "1.1.1", optional = true } tempfile = { workspace = true } +anyhow = { workspace = true } +serde_json = { workspace = true } + +# Required dependencies +tera = { version = "1.17.1" } spirv-builder = { version = "0.9", default-features = false, features = [ "use-installed-tools", ] } -tera = { version = "1.17.1" } -anyhow = { workspace = true } -serde_json = { workspace = true } + +# Optional dependencies +nvtx = { version = "1.3", optional = true } diff --git a/node-graph/gpu-compiler/gpu-compiler-bin-wrapper/Cargo.toml b/node-graph/gpu-compiler/gpu-compiler-bin-wrapper/Cargo.toml index d0bfb843..ac581700 100644 --- a/node-graph/gpu-compiler/gpu-compiler-bin-wrapper/Cargo.toml +++ b/node-graph/gpu-compiler/gpu-compiler-bin-wrapper/Cargo.toml @@ -8,12 +8,13 @@ license = "MIT OR Apache-2.0" default = [] profiling = [] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] +# Local dependencies graph-craft = { path = "../../graph-craft", features = ["serde"] } gpu-executor = { path = "../../gpu-executor" } -log = "0.4" -anyhow = "1.0.66" -serde_json = "1.0.91" -serde = { version = "1.0", features = ["derive"] } + +# Workspace dependencies +log = { workspace = true } +anyhow = { workspace = true } +serde_json = { workspace = true } +serde = { workspace = true, features = ["derive"] } diff --git a/node-graph/gpu-executor/Cargo.toml b/node-graph/gpu-executor/Cargo.toml index bc47d87b..f9474da9 100644 --- a/node-graph/gpu-executor/Cargo.toml +++ b/node-graph/gpu-executor/Cargo.toml @@ -7,19 +7,19 @@ license = "MIT OR Apache-2.0" [features] default = [] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] +# Local dependencies +node-macro = { path = "../node-macro" } + +# Workspace dependencies graphene-core = { workspace = true, features = ["std", "alloc", "gpu"] } graph-craft = { workspace = true } -node-macro = { path = "../node-macro" } dyn-any = { workspace = true, features = ["log-bad-types", "rc", "glam"] } num-traits = { workspace = true } log = { workspace = true } serde = { workspace = true } glam = { workspace = true } base64 = { workspace = true } - bytemuck = { workspace = true } anyhow = { workspace = true } futures = { workspace = true } diff --git a/node-graph/graph-craft/Cargo.toml b/node-graph/graph-craft/Cargo.toml index 04a79b1d..377e91a5 100644 --- a/node-graph/graph-craft/Cargo.toml +++ b/node-graph/graph-craft/Cargo.toml @@ -9,21 +9,24 @@ default = ["dealloc_nodes"] serde = ["dep:serde", "graphene-core/serde", "glam/serde", "bezier-rs/serde"] dealloc_nodes = [] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -graphene-core = { workspace = true, features = ["std"] } +# Local dependencies dyn-any = { path = "../../libraries/dyn-any", features = [ "log-bad-types", "rc", "glam", ] } + +# Workspace dependencies +graphene-core = { workspace = true, features = ["std"] } num-traits = { workspace = true } log = { workspace = true } -serde = { workspace = true, optional = true } glam = { workspace = true } base64 = { workspace = true } bezier-rs = { workspace = true } specta = { workspace = true } bytemuck = { workspace = true } rustc-hash = { workspace = true } + +# Optional workspace dependencies +serde = { workspace = true, optional = true } diff --git a/node-graph/graph-craft/src/proto.rs b/node-graph/graph-craft/src/proto.rs index 255baf43..d8cce4cc 100644 --- a/node-graph/graph-craft/src/proto.rs +++ b/node-graph/graph-craft/src/proto.rs @@ -930,12 +930,12 @@ mod test { assert_eq!( ids, vec![ - NodeId(17957338642374791135), - NodeId(1303972037140595827), - NodeId(15485192931817078264), - NodeId(9739645351331265115), - NodeId(4165308598738454684), - NodeId(5557529806312473178) + NodeId(8751908307531981068), + NodeId(3279077344149194814), + NodeId(532186116905587629), + NodeId(10764326338085309082), + NodeId(18015434340620913446), + NodeId(11801333199647382191) ] ); } diff --git a/node-graph/graphene-cli/Cargo.toml b/node-graph/graphene-cli/Cargo.toml index 4e03b70a..4506975a 100644 --- a/node-graph/graphene-cli/Cargo.toml +++ b/node-graph/graphene-cli/Cargo.toml @@ -6,9 +6,13 @@ description = "CLI interface for the graphene language" authors = ["Graphite Authors "] license = "MIT OR Apache-2.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [features] +default = ["wgpu"] +wgpu = ["wgpu-executor", "gpu", "graphene-std/wgpu"] +wayland = ["graphene-std/wayland"] +profiling = ["wgpu-executor/profiling"] +passthrough = ["wgpu-executor/passthrough"] +quantization = ["graphene-std/quantization"] gpu = [ "interpreted-executor/gpu", "graphene-std/gpu", @@ -16,37 +20,35 @@ gpu = [ "wgpu-executor", "gpu-executor", ] -default = ["wgpu"] -wgpu = ["wgpu-executor", "gpu", "graphene-std/wgpu"] -wayland = ["graphene-std/wayland"] -profiling = ["wgpu-executor/profiling"] -passthrough = ["wgpu-executor/passthrough"] -quantization = ["graphene-std/quantization"] - [dependencies] +# Local dependencies +graphene-std = { path = "../gstd", features = ["serde"] } +interpreted-executor = { path = "../interpreted-executor" } + +# Workspace dependencies log = { workspace = true } bitflags = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } bezier-rs = { workspace = true } glam = { workspace = true } -graphene-std = { path = "../gstd", features = ["serde"] } +graph-craft = { workspace = true } +dyn-any = { workspace = true } +graphene-core = { workspace = true } +futures = { workspace = true } +fern = { workspace = true } +chrono = { workspace = true } +wgpu = { workspace = true } +tokio = { workspace = true, features = ["macros", "rt"] } image = { workspace = true, default-features = false, features = [ "bmp", "png", ] } -graph-craft = { workspace = true } + +# Optional local dependencies wgpu-executor = { path = "../wgpu-executor", optional = true } gpu-executor = { path = "../gpu-executor", optional = true } -interpreted-executor = { path = "../interpreted-executor" } -dyn-any = { workspace = true } -graphene-core = { workspace = true } -wasm-bindgen = { workspace = true, optional = true } -futures = { workspace = true } -fern = { workspace = true } -chrono = { workspace = true } -tokio = { workspace = true, features = ["macros", "rt"] } -wgpu = { workspace = true } -[dev-dependencies] +# Optional workspace dependencies +wasm-bindgen = { workspace = true, optional = true } diff --git a/node-graph/gstd/Cargo.toml b/node-graph/gstd/Cargo.toml index f4c7ca1f..803d7b2d 100644 --- a/node-graph/gstd/Cargo.toml +++ b/node-graph/gstd/Cargo.toml @@ -6,8 +6,6 @@ description = "Graphene standard library" authors = ["Graphite Authors "] license = "MIT OR Apache-2.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [features] default = ["wasm", "imaginate"] gpu = [ @@ -27,34 +25,17 @@ resvg = ["dep:resvg"] wayland = [] [dependencies] -fastnoise-lite = { workspace = true } -rand = { workspace = true, default-features = false, features = [ - "alloc", - "small_rng", -] } -rand_chacha = { workspace = true } -autoquant = { git = "https://github.com/truedoctor/autoquant", optional = true, features = [ - "fitting", -] } +# Local dependencies +dyn-any = { path = "../../libraries/dyn-any", features = ["derive"] } +graph-craft = { path = "../graph-craft", features = ["serde"] } graphene-core = { path = "../gcore", default-features = false, features = [ "std", "serde", "alloc", ] } -dyn-any = { path = "../../libraries/dyn-any", features = ["derive"] } -graph-craft = { path = "../graph-craft", features = ["serde"] } -vulkan-executor = { path = "../vulkan-executor", optional = true } -wgpu-executor = { path = "../wgpu-executor", optional = true } -gpu-executor = { path = "../gpu-executor", optional = true } -gpu-compiler-bin-wrapper = { path = "../gpu-compiler/gpu-compiler-bin-wrapper", optional = true } -compilation-client = { path = "../compilation-client", optional = true } -bytemuck = { workspace = true } -image = { workspace = true, default-features = false, features = [ - "png", - "jpeg", -] } -base64 = { workspace = true, optional = true } -wgpu = { workspace = true, optional = true } + +# Workspace dependencies +fastnoise-lite = { workspace = true } log = { workspace = true } bezier-rs = { workspace = true, features = ["serde"] } glam = { workspace = true, features = ["serde"] } @@ -63,17 +44,37 @@ rustc-hash = { workspace = true } serde_json = { workspace = true } reqwest = { workspace = true } futures = { workspace = true } -wasm-bindgen = { workspace = true, optional = true } -js-sys = { workspace = true, optional = true } wgpu-types = { workspace = true } -wasm-bindgen-futures = { workspace = true, optional = true } winit = { workspace = true } url = { workspace = true } +usvg = { workspace = true } +rand_chacha = { workspace = true } +rand = { workspace = true, default-features = false, features = [ + "alloc", + "small_rng", +] } +bytemuck = { workspace = true } +image = { workspace = true, default-features = false, features = [ + "png", + "jpeg", +] } + +# Optional local dependencies +vulkan-executor = { path = "../vulkan-executor", optional = true } +wgpu-executor = { path = "../wgpu-executor", optional = true } +gpu-executor = { path = "../gpu-executor", optional = true } +gpu-compiler-bin-wrapper = { path = "../gpu-compiler/gpu-compiler-bin-wrapper", optional = true } +compilation-client = { path = "../compilation-client", optional = true } + +# Optional workspace dependencies +base64 = { workspace = true, optional = true } +wgpu = { workspace = true, optional = true } +wasm-bindgen = { workspace = true, optional = true } +js-sys = { workspace = true, optional = true } +wasm-bindgen-futures = { workspace = true, optional = true } tokio = { workspace = true, optional = true, features = ["fs", "io-std"] } -image-compare = { version = "0.3.0", optional = true } vello = { workspace = true, optional = true } resvg = { workspace = true, optional = true } -usvg = { workspace = true } serde = { workspace = true, optional = true, features = ["derive"] } web-sys = { workspace = true, optional = true, features = [ "Window", @@ -86,3 +87,9 @@ web-sys = { workspace = true, optional = true, features = [ "HtmlImageElement", "ImageBitmapRenderingContext", ] } +autoquant = { git = "https://github.com/truedoctor/autoquant", optional = true, features = [ + "fitting", +] } + +# Optional dependencies +image-compare = { version = "0.4.1", optional = true } diff --git a/node-graph/gstd/src/imaginate.rs b/node-graph/gstd/src/imaginate.rs index 25cdda0c..c8c42ae8 100644 --- a/node-graph/gstd/src/imaginate.rs +++ b/node-graph/gstd/src/imaginate.rs @@ -6,7 +6,7 @@ use glam::{DVec2, U64Vec2}; use graph_craft::imaginate_input::{ImaginateController, ImaginateMaskStartingFill, ImaginatePreferences, ImaginateSamplingMethod, ImaginateServerStatus, ImaginateStatus, ImaginateTerminationHandle}; use graphene_core::application_io::NodeGraphUpdateMessage; use graphene_core::raster::{Color, Image, Luma, Pixel}; -use image::{DynamicImage, ImageBuffer, ImageOutputFormat}; +use image::{DynamicImage, ImageBuffer, ImageFormat}; use reqwest::Url; const PROGRESS_EVERY_N_STEPS: u32 = 5; @@ -468,7 +468,7 @@ fn image_to_base64(image: Image

) -> Result { }; let mut png_data = std::io::Cursor::new(vec![]); - image.write_to(&mut png_data, ImageOutputFormat::Png).map_err(Error::ImageEncode)?; + image.write_to(&mut png_data, ImageFormat::Png).map_err(Error::ImageEncode)?; Ok(BASE64_STANDARD.encode(png_data.into_inner())) } diff --git a/node-graph/interpreted-executor/Cargo.toml b/node-graph/interpreted-executor/Cargo.toml index 33aef72d..33735208 100644 --- a/node-graph/interpreted-executor/Cargo.toml +++ b/node-graph/interpreted-executor/Cargo.toml @@ -10,19 +10,21 @@ serde = ["dep:serde", "graphene-std/serde", "glam/serde"] gpu = ["graphene-std/gpu", "graphene-core/gpu", "graphene-std/wgpu"] quantization = ["graphene-std/quantization"] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -graphene-core = { workspace = true, features = ["std"] } +# Local dependencies graphene-std = { path = "../gstd", features = ["serde"] } graph-craft = { path = "../graph-craft" } gpu-executor = { path = "../gpu-executor" } wgpu-executor = { path = "../wgpu-executor" } + +# Workspace dependencies +graphene-core = { workspace = true, features = ["std"] } dyn-any = { workspace = true, features = ["log-bad-types", "glam"] } num-traits = { workspace = true } log = { workspace = true } -serde = { workspace = true, optional = true } glam = { workspace = true } -# Remove when `core::cell::LazyCell` is stabilized () -once_cell = "1.18" futures = { workspace = true } +once_cell = { workspace = true } + +# Optional workspace dependencies +serde = { workspace = true, optional = true } diff --git a/node-graph/node-macro/Cargo.toml b/node-graph/node-macro/Cargo.toml index 1d27227c..64d7b573 100644 --- a/node-graph/node-macro/Cargo.toml +++ b/node-graph/node-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "node-macro" publish = false version = "0.0.0" -rust-version = "1.66.0" +rust-version = "1.70.0" authors = ["Graphite Authors "] edition = "2021" readme = "../../README.md" @@ -10,12 +10,11 @@ homepage = "https://graphite.rs" repository = "https://github.com/GraphiteEditor/Graphite" license = "Apache-2.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [lib] proc-macro = true [dependencies] +# Workspace dependencies syn = { workspace = true } proc-macro2 = { workspace = true } quote = { workspace = true } diff --git a/node-graph/vulkan-executor/Cargo.toml b/node-graph/vulkan-executor/Cargo.toml index ccb52865..025ead33 100644 --- a/node-graph/vulkan-executor/Cargo.toml +++ b/node-graph/vulkan-executor/Cargo.toml @@ -7,9 +7,8 @@ license = "MIT OR Apache-2.0" [features] default = [] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] +# Local dependencies graphene-core = { path = "../gcore", features = ["std", "alloc", "gpu"] } graph-craft = { path = "../graph-craft" } dyn-any = { path = "../../libraries/dyn-any", features = [ @@ -17,11 +16,17 @@ dyn-any = { path = "../../libraries/dyn-any", features = [ "rc", "glam", ] } + +# Workspace dependencies num-traits = { workspace = true } log = { workspace = true } -serde = { workspace = true, optional = true } glam = { workspace = true } base64 = { workspace = true } -vulkano = { git = "https://github.com/GraphiteEditor/vulkano", branch = "fix_rust_gpu" } bytemuck = { workspace = true } anyhow = { workspace = true } + +# Required dependencies +vulkano = { git = "https://github.com/GraphiteEditor/vulkano", branch = "fix_rust_gpu" } + +# Optional workspace dependencies +serde = { workspace = true, optional = true } diff --git a/node-graph/wgpu-executor/Cargo.toml b/node-graph/wgpu-executor/Cargo.toml index 26dc7c36..793a20ee 100644 --- a/node-graph/wgpu-executor/Cargo.toml +++ b/node-graph/wgpu-executor/Cargo.toml @@ -9,16 +9,16 @@ default = [] profiling = ["nvtx"] passthrough = [] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] +# Local dependencies +gpu-executor = { path = "../gpu-executor" } + +# Workspace dependencies graphene-core = { workspace = true, features = ["std", "alloc", "gpu"] } graph-craft = { workspace = true } -gpu-executor = { path = "../gpu-executor" } dyn-any = { workspace = true, features = ["log-bad-types", "rc", "glam"] } num-traits = { workspace = true } log = { workspace = true } -serde = { workspace = true, optional = true } glam = { workspace = true } base64 = { workspace = true } bytemuck = { workspace = true } @@ -26,7 +26,14 @@ anyhow = { workspace = true } wgpu = { workspace = true, features = ["spirv"] } spirv = { workspace = true } futures = { workspace = true } -futures-intrusive = "0.5.0" web-sys = { workspace = true, features = ["HtmlCanvasElement"] } winit = { workspace = true } -nvtx = { version = "1.2", optional = true } + +# Required dependencies +futures-intrusive = "0.5.0" + +# Optional workspace dependencies +serde = { workspace = true, optional = true } + +# Optional dependencies +nvtx = { version = "1.3", optional = true } diff --git a/proc-macros/Cargo.toml b/proc-macros/Cargo.toml index 84982e5d..3afa94de 100644 --- a/proc-macros/Cargo.toml +++ b/proc-macros/Cargo.toml @@ -2,7 +2,7 @@ name = "graphite-proc-macros" publish = false version = "0.0.0" -rust-version = "1.66.0" +rust-version = "1.70.0" authors = ["Graphite Authors "] edition = "2021" readme = "../README.md" @@ -19,13 +19,14 @@ default = ["serde-discriminant"] serde-discriminant = [] [dependencies] +# Workspace dependencies proc-macro2 = { workspace = true } syn = { workspace = true } quote = { workspace = true } -[dev-dependencies.editor] -path = "../editor" -package = "graphite-editor" - [dev-dependencies] +# Local dependencies +editor = { path = "../editor", package = "graphite-editor" } + +# Workspace dependencies serde = { workspace = true } diff --git a/website/other/bezier-rs-demos/wasm/Cargo.toml b/website/other/bezier-rs-demos/wasm/Cargo.toml index 5a4ce1b6..8a77aba8 100644 --- a/website/other/bezier-rs-demos/wasm/Cargo.toml +++ b/website/other/bezier-rs-demos/wasm/Cargo.toml @@ -2,7 +2,7 @@ name = "bezier-rs-wasm" publish = false version = "0.0.0" -rust-version = "1.66.0" +rust-version = "1.70.0" authors = ["Graphite Authors "] edition = "2021" readme = "../../README.md" @@ -14,12 +14,13 @@ license = "Apache-2.0" crate-type = ["cdylib", "rlib"] [dependencies] +# Workspace dependencies bezier-rs = { workspace = true } log = { workspace = true } serde = { workspace = true, features = ["derive"] } +serde-wasm-bindgen = { workspace = true } wasm-bindgen = { workspace = true } serde_json = { workspace = true } -serde-wasm-bindgen = "0.6" js-sys = { workspace = true } glam = { workspace = true, features = ["serde"] }