bump msrv 1.64 and tts + bindgen dep (emilk#2274)

* bump msrv 1.64 and tts + bindgen dep * Update crates/egui-winit/Cargo.toml Co-authored-by: Emil Ernerfeldt <[email protected]> * Update crates/eframe/Cargo.toml Co-authored-by: Emil Ernerfeldt <[email protected]> Co-authored-by: Emil Ernerfeldt <[email protected]>
te-king · Nov 11, 2022 · 8ff1396 · 8ff1396
1 parent e225c6b
commit 8ff1396
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 69 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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" ]