diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4e7df16a3..ba97b4654 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,7 @@ "pnpmVersion": "12.8.1" }, "ghcr.io/devcontainers/features/rust:1": { - "version": "1.98.1", + "version": "1.99.0", "profile": "default" }, "ghcr.io/devcontainers/features/git:1": {}, diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index eb366e654..49dd85ae2 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -154,7 +154,7 @@ jobs: - name: Install Rust Stable uses: dtolnay/rust-toolchain@master with: - toolchain: '1.98.1' + toolchain: '1.99.0' targets: ${{ matrix.target }} - name: Add Rust Target @@ -206,7 +206,7 @@ jobs: - name: Add Rust Target run: | - rustup target add ${{ matrix.target }} --toolchain 1.98.1 || rustup target add ${{ matrix.target }} + rustup target add ${{ matrix.target }} --toolchain 1.99.0 || rustup target add ${{ matrix.target }} rustup target list --installed echo "Rust target ${{ matrix.target }} installed." @@ -257,7 +257,7 @@ jobs: - name: Install Rust Stable uses: dtolnay/rust-toolchain@master with: - toolchain: '1.98.1' + toolchain: '1.99.0' targets: ${{ matrix.target }} - name: Add Rust Target @@ -347,7 +347,7 @@ jobs: - name: Add Rust Target run: | - rustup target add ${{ matrix.target }} --toolchain 1.98.1 || rustup target add ${{ matrix.target }} + rustup target add ${{ matrix.target }} --toolchain 1.99.0 || rustup target add ${{ matrix.target }} rustup target list --installed echo "Rust target ${{ matrix.target }} installed." @@ -454,7 +454,7 @@ jobs: - name: Add Rust Target run: | - rustup target add ${{ matrix.target }} --toolchain 1.98.1 || rustup target add ${{ matrix.target }} + rustup target add ${{ matrix.target }} --toolchain 1.99.0 || rustup target add ${{ matrix.target }} rustup target list --installed echo "Rust target ${{ matrix.target }} installed." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index ef061de95..36ef5baab 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -74,7 +74,7 @@ jobs: - name: Install Rust Stable if: github.event.inputs[matrix.input] == 'true' - uses: dtolnay/rust-toolchain@1.98.1 + uses: dtolnay/rust-toolchain@1.99.0 - name: Rust Cache uses: Swatinem/rust-cache@v2 @@ -129,7 +129,7 @@ jobs: if: github.event.inputs[matrix.input] == 'true' run: | # Ensure cross target is installed for the pinned toolchain; fallback without explicit toolchain if needed - rustup target add ${{ matrix.target }} --toolchain 1.98.1 || rustup target add ${{ matrix.target }} + rustup target add ${{ matrix.target }} --toolchain 1.99.0 || rustup target add ${{ matrix.target }} rustup target list --installed echo "Rust target ${{ matrix.target }} installed." diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 97d748a53..d2191eeb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -204,7 +204,7 @@ jobs: - name: Install Rust Stable uses: dtolnay/rust-toolchain@master with: - toolchain: '1.98.1' + toolchain: '1.99.0' targets: ${{ matrix.target }} - name: Add Rust Target @@ -244,7 +244,7 @@ jobs: - name: Add Rust Target run: | - rustup target add ${{ matrix.target }} --toolchain 1.98.1 || rustup target add ${{ matrix.target }} + rustup target add ${{ matrix.target }} --toolchain 1.99.0 || rustup target add ${{ matrix.target }} rustup target list --installed echo "Rust target ${{ matrix.target }} installed." @@ -311,7 +311,7 @@ jobs: - name: Install Rust Stable uses: dtolnay/rust-toolchain@master with: - toolchain: '1.98.1' + toolchain: '1.99.0' targets: ${{ matrix.target }} - name: Add Rust Target @@ -389,7 +389,7 @@ jobs: - name: Add Rust Target run: | - rustup target add ${{ matrix.target }} --toolchain 1.98.1 || rustup target add ${{ matrix.target }} + rustup target add ${{ matrix.target }} --toolchain 1.99.0 || rustup target add ${{ matrix.target }} rustup target list --installed echo "Rust target ${{ matrix.target }} installed." @@ -446,7 +446,7 @@ jobs: - name: Install Rust Stable uses: dtolnay/rust-toolchain@master with: - toolchain: '1.98.1' + toolchain: '1.99.0' targets: ${{ matrix.target }} - name: Add Rust Target @@ -487,7 +487,7 @@ jobs: - name: Add Rust Target run: | - rustup target add ${{ matrix.target }} --toolchain 1.98.1 || rustup target add ${{ matrix.target }} + rustup target add ${{ matrix.target }} --toolchain 1.99.0 || rustup target add ${{ matrix.target }} rustup target list --installed echo "Rust target ${{ matrix.target }} installed." diff --git a/.tool-versions b/.tool-versions index 62f095f23..7010529ea 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ nodejs 24.21.0 pnpm 12.8.1 -rust 1.98.1 +rust 1.99.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 68c0ea297..099ed62f9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.98.1" +channel = "1.99.0" components = ["rustfmt", "clippy"] diff --git a/src-tauri/src/core/manager/mod.rs b/src-tauri/src/core/manager/mod.rs index ae5889e7d..52dd53748 100644 --- a/src-tauri/src/core/manager/mod.rs +++ b/src-tauri/src/core/manager/mod.rs @@ -244,7 +244,7 @@ impl CoreManager { pub(crate) fn invalidate_core_readiness(&self) { let _ = self .core_readiness_state - .fetch_update(Ordering::AcqRel, Ordering::Acquire, |current| { + .try_update(Ordering::AcqRel, Ordering::Acquire, |current| { active_core_readiness_generation(current).map(inactive_core_readiness_state) }); } diff --git a/src-tauri/src/core/timer.rs b/src-tauri/src/core/timer.rs index 45b69bffa..c11bea60a 100644 --- a/src-tauri/src/core/timer.rs +++ b/src-tauri/src/core/timer.rs @@ -477,7 +477,9 @@ impl Timer { Ok(_) => { logging!(debug, Type::Timer, "timer task completed for uid: {}", uid); } - Err(e) => logging_error!(Type::Timer, "Failed to update profile uid {}: {e:#}", uid), + Err(e) => { + logging_error!(Type::Timer, "Failed to update profile uid {}: {e:#}", uid); + } }, || Self::emit_update_event(uid, false), )