Move to Rust stable

.cargo/config_fast_builds.toml

@@ -30,7 +30,7 @@ rustflags = [
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld.exe" # Use LLD Linker
 rustflags = [
-    "-Zshare-generics=n",
+    "-Zshare-generics=n", # (Nightly)
     "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads.
 ]
 

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
     types: [ labeled, opened, synchronize, reopened ]
 env:
   CARGO_TERM_COLOR: always
-  NIGHTLY_TOOLCHAIN: nightly
+  CARGO_TOOLCHAIN: stable
   # Sparse cargo registry for faster updates
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
 
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_TOOLCHAIN }}
       - name: Cache Cargo build files
         uses: Leafwing-Studios/cargo-cache@v1
       - name: Install alsa and udev
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_TOOLCHAIN }}
           components: rustfmt, clippy
       - name: Cache Cargo build files
         uses: Leafwing-Studios/cargo-cache@v1

.github/workflows/release.yaml

@@ -12,7 +12,7 @@ env:
   GAME_OSX_APP_NAME: Foxtrot
 
   CARGO_TERM_COLOR: always
-  NIGHTLY_TOOLCHAIN: nightly
+  CARGO_TOOLCHAIN: stable
   # Sparse cargo registry for faster updates
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
 
@@ -38,15 +38,15 @@ jobs:
       - name: Install rust toolchain for Apple Silicon
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_TOOLCHAIN }}
           target: aarch64-apple-darwin
       - name: Build release for Apple Silicon
         run: |
           SDKROOT=$(xcrun -sdk macosx --show-sdk-path) cargo build --release --target=aarch64-apple-darwin
       - name: Install rust toolchain for Apple x86
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_TOOLCHAIN }}
           target: x86_64-apple-darwin
       - name: Build release for x86 Apple
         run: |
@@ -85,7 +85,7 @@ jobs:
       - name: Install rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_TOOLCHAIN }}
       - name: Install Dependencies
         run: sudo apt-get update; sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev
       - name: Build release
@@ -120,7 +120,7 @@ jobs:
       - name: Install rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_TOOLCHAIN }}
       - name: Install dotnet
         uses: actions/setup-dotnet@v3
         with:

.gitignore

@@ -12,3 +12,4 @@ blender_assets.cats.txt*
 trace-*.json
 
 .cargo/config.toml
+rust-toolchain.toml

src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(let_chains)]
 // These two generate a lot of false positives for Bevy systems
 #![allow(clippy::too_many_arguments, clippy::type_complexity)]
 

src/player_control/camera/rig.rs

@@ -83,8 +83,9 @@ fn set_look_at(rig: &mut Rig, camera: &IngameCamera) {
 }
 
 fn set_position(rig: &mut Rig, camera: &IngameCamera) {
-    let target = if camera.kind != IngameCameraKind::FirstPerson
-        && let Some(secondary_target) = camera.secondary_target
+    let target = if let Some(secondary_target) = camera
+        .secondary_target
+        .filter(|_| camera.kind != IngameCameraKind::FirstPerson)
     {
         secondary_target
     } else {