git.delta.rocks / jrsonnet / refs/commits / f78972ccc432

difftreelog

ci fallback to stable fenix if not available

mmykuvttYaroslav Bolyukin2026-05-06parent: #5f11fd7.patch.diff
in: master
It is only used for better clippy and rustfmt anyway

3 files changed

modifiedflake.nixdiffbeforeafterboth
--- 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"
modifiedxtask/src/bench.rsdiffbeforeafterboth
--- 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)]
modifiedxtask/src/main.rsdiffbeforeafterboth
1use anyhow::Result;
1#[cfg(not(target_os = "linux"))]2#[cfg(not(target_os = "linux"))]
2use anyhow::bail;3use anyhow::bail;
3use anyhow::Result;
4use clap::Parser;4use clap::Parser;
5use xshell::{cmd, Shell};5use xshell::{Shell, cmd};
66
7#[cfg(target_os = "linux")]7#[cfg(target_os = "linux")]
8mod bench;8mod bench;