From 8ff139687a0e34415ec9282ec50e653b38fbfc69 Mon Sep 17 00:00:00 2001 From: Red Artist Date: Fri, 11 Nov 2022 14:57:25 +0530 Subject: [PATCH] bump msrv 1.64 and tts + bindgen dep (#2274) * bump msrv 1.64 and tts + bindgen dep * Update crates/egui-winit/Cargo.toml Co-authored-by: Emil Ernerfeldt * Update crates/eframe/Cargo.toml Co-authored-by: Emil Ernerfeldt Co-authored-by: Emil Ernerfeldt --- .github/workflows/rust.yml | 14 ++-- Cargo.lock | 150 +++++++++++++++++++++-------------- Cranky.toml | 4 + crates/eframe/Cargo.toml | 2 +- crates/egui-winit/Cargo.toml | 2 +- rust-toolchain | 2 +- 6 files changed, 105 insertions(+), 69 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 269597071..563a78ed5 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -13,13 +13,13 @@ env: jobs: fmt-crank-check-test: name: Format + check + test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: profile: default - toolchain: 1.62.0 + toolchain: 1.64.0 override: true - name: Install packages (Linux) if: runner.os == 'Linux' @@ -78,13 +78,13 @@ jobs: check_wasm: name: Check wasm32 + wasm-bindgen - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.62.0 + toolchain: 1.64.0 target: wasm32-unknown-unknown override: true @@ -131,7 +131,7 @@ jobs: cargo-deny: name: cargo deny - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: EmbarkStudios/cargo-deny-action@v1 @@ -140,13 +140,13 @@ jobs: android: name: android - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.62.0 + toolchain: 1.64.0 target: aarch64-linux-android override: true - name: Set up cargo cache diff --git a/Cargo.lock b/Cargo.lock index 1057e8366..99b1d4b03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,15 +322,13 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.60.1" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" dependencies = [ "bitflags", "cexpr", "clang-sys", - "clap", - "env_logger", "lazy_static", "lazycell", "log", @@ -340,6 +338,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn", "which", ] @@ -578,12 +577,9 @@ version = "3.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" dependencies = [ - "atty", "bitflags", "clap_lex", "indexmap", - "strsim", - "termcolor", "textwrap", ] @@ -1044,6 +1040,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dlib" version = "0.5.0" @@ -1353,19 +1360,6 @@ dependencies = [ "syn", ] -[[package]] -name = "env_logger" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "epaint" version = "0.19.0" @@ -1950,12 +1944,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "iana-time-zone" version = "0.1.46" @@ -3336,11 +3324,12 @@ dependencies = [ [[package]] name = "speech-dispatcher" -version = "0.12.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbab517fe176eb95d9bcc23c5ba75500fc5157d13a6978cfe135395fa149e151" +checksum = "c3d62720b035474bccfd208cb85b1772adfae4b3450c743853e2e7b9c67e441e" dependencies = [ "lazy_static", + "libc", "speech-dispatcher-sys", ] @@ -3625,6 +3614,15 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "tinystr" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2" +dependencies = [ + "displaydoc", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -3736,11 +3734,12 @@ checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "tts" -version = "0.20.4" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f14cef4d39fc1b2a69d163772c9015d6e33d694a1f1e2047ec32274675a17cb" +checksum = "810084d246c730f3cadc70fb74ceb4d1abf84d8bcdb7dc81e55ac808992da2c8" dependencies = [ "cocoa-foundation", + "core-foundation", "dyn-clonable", "jni", "lazy_static", @@ -3750,9 +3749,10 @@ dependencies = [ "objc", "speech-dispatcher", "thiserror", + "unic-langid", "wasm-bindgen", "web-sys", - "windows 0.33.0", + "windows 0.42.0", ] [[package]] @@ -3784,6 +3784,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "tinystr", +] + [[package]] name = "unicode-bidi" version = "0.3.8" @@ -4328,19 +4346,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0128fa8e65e0616e45033d68dc0b7fbd521080b7844e5cad3a4a4d201c4b2bd2" -dependencies = [ - "windows_aarch64_msvc 0.33.0", - "windows_i686_gnu 0.33.0", - "windows_i686_msvc 0.33.0", - "windows_x86_64_gnu 0.33.0", - "windows_x86_64_msvc 0.33.0", -] - [[package]] name = "windows" version = "0.37.0" @@ -4354,6 +4359,21 @@ dependencies = [ "windows_x86_64_msvc 0.37.0", ] +[[package]] +name = "windows" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + [[package]] name = "windows-sys" version = "0.36.1" @@ -4368,10 +4388,10 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_msvc" -version = "0.33.0" +name = "windows_aarch64_gnullvm" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" [[package]] name = "windows_aarch64_msvc" @@ -4386,10 +4406,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" [[package]] -name = "windows_i686_gnu" -version = "0.33.0" +name = "windows_aarch64_msvc" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" [[package]] name = "windows_i686_gnu" @@ -4404,10 +4424,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" [[package]] -name = "windows_i686_msvc" -version = "0.33.0" +name = "windows_i686_gnu" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" [[package]] name = "windows_i686_msvc" @@ -4422,10 +4442,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" [[package]] -name = "windows_x86_64_gnu" -version = "0.33.0" +name = "windows_i686_msvc" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" [[package]] name = "windows_x86_64_gnu" @@ -4440,10 +4460,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" [[package]] -name = "windows_x86_64_msvc" -version = "0.33.0" +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" [[package]] name = "windows_x86_64_msvc" @@ -4457,6 +4483,12 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winit" version = "0.27.2" diff --git a/Cranky.toml b/Cranky.toml index 98ac319ee..ce6c9e57d 100644 --- a/Cranky.toml +++ b/Cranky.toml @@ -108,4 +108,8 @@ warn = [ ] allow = [ + "clippy::derive_partial_eq_without_eq", + "clippy::type_complexity", + "clippy::unnecessary_lazy_evaluations", + "clippy::let-and-return" ] diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index 04fdf2afd..c4202f193 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -145,5 +145,5 @@ web-sys = { version = "0.3.58", features = [ # optional web: egui-wgpu = { version = "0.19.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit -tts = { version = "0.20", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux +tts = { version = "0.24", optional = true } wgpu = { version = "0.14", optional = true, features = ["webgl"] } diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 0ebd9f49f..70cb6f52f 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -61,7 +61,7 @@ puffin = { version = "0.14", optional = true } serde = { version = "1.0", optional = true, features = ["derive"] } # feature screen_reader -tts = { version = "0.20", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux +tts = { version = "0.24", optional = true } webbrowser = { version = "0.8", optional = true } diff --git a/rust-toolchain b/rust-toolchain index 760a2abc6..89a258981 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -5,6 +5,6 @@ # to the user in the error, instead of "error: invalid channel name '[toolchain]'". [toolchain] -channel = "1.62.0" +channel = "1.64.0" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ]