From 037ca5f9cdb3a8ab61df5b10028448bf012cfc8b Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 29 Dec 2021 10:56:16 +0100 Subject: [PATCH] update tts 0.17 -> 0.19 --- Cargo.lock | 159 +++++------------------------------------- egui-winit/Cargo.toml | 2 +- egui_web/Cargo.toml | 2 +- 3 files changed, 19 insertions(+), 144 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index faf6fc42..27b906f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -436,12 +436,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "const-sha1" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" - [[package]] name = "copypasta" version = "0.7.1" @@ -655,38 +649,14 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" dependencies = [ - "darling_core 0.13.1", - "darling_macro 0.13.1", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", + "darling_core", + "darling_macro", ] [[package]] @@ -703,24 +673,13 @@ dependencies = [ "syn", ] -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn", -] - [[package]] name = "darling_macro" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" dependencies = [ - "darling_core 0.13.1", + "darling_core", "quote", "syn", ] @@ -1593,18 +1552,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "ndk" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" -dependencies = [ - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - [[package]] name = "ndk" version = "0.5.0" @@ -1618,20 +1565,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ndk-glue" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.3.0", - "ndk-macro 0.2.0", - "ndk-sys", -] - [[package]] name = "ndk-glue" version = "0.5.0" @@ -1641,32 +1574,19 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk 0.5.0", - "ndk-macro 0.3.0", + "ndk", + "ndk-macro", "ndk-sys", ] -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling 0.10.2", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "ndk-macro" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" dependencies = [ - "darling 0.13.1", - "proc-macro-crate 1.1.0", + "darling", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -1784,7 +1704,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5249369707a1e07b39f78d98c8f34e00aca7dcb053812fdbb5ad7be82c1bba38" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -1977,15 +1897,6 @@ dependencies = [ "miniz_oxide 0.3.7", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro-crate" version = "1.1.0" @@ -2119,7 +2030,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.29.0", + "windows", ] [[package]] @@ -2333,9 +2244,9 @@ dependencies = [ [[package]] name = "speech-dispatcher" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076efad2c03a1c5cc41eaa82c30770130e014f6544769edea79e096a2f134412" +checksum = "9b684552615661fef2658506637989f8a8ead697c83c9a35a12d2a11bbd96955" dependencies = [ "lazy_static", "speech-dispatcher-sys", @@ -2363,12 +2274,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -2550,9 +2455,9 @@ checksum = "76dacc724328b3d5e2ed67f9e30cdb56893a34ab239032502cc8f19f8dae4bbc" [[package]] name = "tts" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3701ee536e3a14925c181a858e087ec7a7129c437f06acd3c6d785b463f1c060" +checksum = "38dcd7e0cdd94949f55b94c24ccbb7922437883ec268dbbac23480db32287016" dependencies = [ "cocoa-foundation", "dyn-clonable", @@ -2560,13 +2465,13 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk-glue 0.3.0", + "ndk-glue", "objc", "speech-dispatcher", "thiserror", "wasm-bindgen", "web-sys", - "windows 0.9.1", + "windows", ] [[package]] @@ -2915,17 +2820,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "361f3533a83ee1a28c9be59683f40043db02dbedf6479ce8795657386195c97f" -dependencies = [ - "const-sha1", - "windows_gen", - "windows_macros", -] - [[package]] name = "windows" version = "0.29.0" @@ -2945,15 +2839,6 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" -[[package]] -name = "windows_gen" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54154dbc515d58723f6b6053c12f1065da7389f733660581b2391bd1af480452" -dependencies = [ - "syn", -] - [[package]] name = "windows_i686_gnu" version = "0.29.0" @@ -2966,16 +2851,6 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" -[[package]] -name = "windows_macros" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f7794c652845dc466cb8dc1b86c08345707c8144bc53e9086430047c7d33b76" -dependencies = [ - "syn", - "windows_gen", -] - [[package]] name = "windows_x86_64_gnu" version = "0.29.0" @@ -3006,8 +2881,8 @@ dependencies = [ "libc", "log", "mio", - "ndk 0.5.0", - "ndk-glue 0.5.0", + "ndk", + "ndk-glue", "ndk-sys", "objc", "parking_lot", diff --git a/egui-winit/Cargo.toml b/egui-winit/Cargo.toml index 4027960f..6f4e3e13 100644 --- a/egui-winit/Cargo.toml +++ b/egui-winit/Cargo.toml @@ -32,7 +32,7 @@ serde = { version = "1.0", optional = true, features = ["derive"] } webbrowser = { version = "0.5", optional = true } # feature screen_reader -tts = { version = "0.17", optional = true } +tts = { version = "0.19", optional = true } [features] default = ["clipboard", "links"] diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml index 4352f554..8c1778db 100644 --- a/egui_web/Cargo.toml +++ b/egui_web/Cargo.toml @@ -34,7 +34,7 @@ epi = { version = "0.15.0", path = "../epi" } js-sys = "0.3" ron = { version = "0.7", optional = true } serde = { version = "1", optional = true } -tts = { version = "0.17", optional = true } # feature screen_reader +tts = { version = "0.19", optional = true } # feature screen_reader wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4"