diff --git a/rust/Dockerfile b/rust/Dockerfile index 2d3660eac..4e8dc3cbc 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -1,5 +1,5 @@ # Keep synced with `rust-toolchain.toml` -ARG RUST_VERSION="1.83.0" +ARG RUST_VERSION="1.84.0" ARG ALPINE_VERSION="3.20" ARG CARGO_CHEF_VERSION="0.1.67" diff --git a/rust/gui-client/src-common/src/controller.rs b/rust/gui-client/src-common/src/controller.rs index 078d903a4..28223fb6d 100644 --- a/rust/gui-client/src-common/src/controller.rs +++ b/rust/gui-client/src-common/src/controller.rs @@ -179,7 +179,7 @@ enum EventloopTick { UpdateNotification(Option>), } -impl<'a, I: GuiIntegration> Controller<'a, I> { +impl Controller<'_, I> { pub async fn start( ctlr_tx: CtlrTx, integration: I, diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml index 672aacb04..582a612be 100644 --- a/rust/rust-toolchain.toml +++ b/rust/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] # Keep synced with `Dockerfile` -channel = "1.83.0" +channel = "1.84.0" diff --git a/scripts/nix/flake.lock b/scripts/nix/flake.lock index fee51bb1e..3e0fbbe99 100644 --- a/scripts/nix/flake.lock +++ b/scripts/nix/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732802692, - "narHash": "sha256-kFrxb45qj52TT/OFUFyTdmvXkn/KXDUL0/DOtjHEQvs=", + "lastModified": 1736476219, + "narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "34971069ec33755b2adf2481851f66d8ec9a6bfa", + "rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9", "type": "github" }, "original": { diff --git a/scripts/nix/flake.nix b/scripts/nix/flake.nix index c416ca1cf..f0f612015 100644 --- a/scripts/nix/flake.nix +++ b/scripts/nix/flake.nix @@ -5,7 +5,7 @@ rust-overlay.url = "github:oxalica/rust-overlay"; }; - outputs = { nixpkgs, flake-utils, rust-overlay, ... } @ inputs: + outputs = { nixpkgs, flake-utils, rust-overlay, ... }: flake-utils.lib.eachDefaultSystem ( system: