From f78972ccc432ea345aa4e312472e53095982a9b3 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Wed, 06 May 2026 01:56:39 +0000 Subject: [PATCH] ci: fallback to stable fenix if not available It is only used for better clippy and rustfmt anyway --- --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ targetArch = pkgs.stdenv.hostPlatform.parsed.cpu.name; rustfmt = (pkgs.fenix.complete or pkgs.fenix.stable).rustfmt; toolchain = pkgs.fenix.combine [ - (pkgs.fenix.complete.withComponents [ + ((pkgs.fenix.complete or pkgs.fenix.stable).withComponents [ "cargo" "clippy" "rustc" --- a/xtask/src/bench.rs +++ b/xtask/src/bench.rs @@ -5,7 +5,7 @@ time::Instant, }; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use nix::{libc, sys::wait::WaitStatus, unistd::Pid}; #[derive(Debug, Clone)] --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1,8 +1,8 @@ +use anyhow::Result; #[cfg(not(target_os = "linux"))] use anyhow::bail; -use anyhow::Result; use clap::Parser; -use xshell::{cmd, Shell}; +use xshell::{Shell, cmd}; #[cfg(target_os = "linux")] mod bench; -- gitstuff