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
5	time::Instant,5	time::Instant,
6};6};
77
8use anyhow::{bail, Result};8use anyhow::{Result, bail};
9use nix::{libc, sys::wait::WaitStatus, unistd::Pid};9use nix::{libc, sys::wait::WaitStatus, unistd::Pid};
1010
11#[derive(Debug, Clone)]11#[derive(Debug, Clone)]
modifiedxtask/src/main.rsdiffbeforeafterboth
--- 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;