treefmt: add nightly rustfmt via fenix with formatting config

This commit adds a rustfmt formatting config with some nightly options enabled that greatly improve the formatter. Some of the highlights include wrapping comments & strings, organizing imports, and formatting imports to have 1 import per line (which really helps with diffs). Due to all these formatting goodies, the diff is quite massive but nothing functionally changed.

Author: amaanq

.rustfmt.toml

@@ -0,0 +1,25 @@
+condense_wildcard_suffixes   = true
+doc_comment_code_block_width = 100
+edition                      = "2024"
+enum_discrim_align_threshold = 60
+float_literal_trailing_zero  = "Always"
+force_multiline_blocks       = true
+format_code_in_doc_comments  = true
+format_macro_matchers        = true
+format_strings               = true
+group_imports                = "StdExternalCrate"
+hex_literal_case             = "Upper"
+imports_granularity          = "Crate"
+imports_layout               = "Vertical"
+inline_attribute_width       = 60
+match_block_trailing_comma   = true
+max_width                    = 100
+newline_style                = "Unix"
+normalize_comments           = true
+normalize_doc_attributes     = true
+overflow_delimited_expr      = true
+struct_field_align_threshold = 60
+unstable_features            = true
+use_field_init_shorthand     = true
+use_try_shorthand            = true
+wrap_comments                = true

Cargo.toml

@@ -1,9 +1,9 @@
 [workspace]
-
 members  = [ "subprojects/hydra-builder", "subprojects/hydra-queue-runner", "subprojects/crates/*" ]
 resolver = "2"
 
 [workspace.package]
+edition      = "2024"
 rust-version = "1.91.0"
 version      = "0.1.0"
 

flake.lock

@@ -15,6 +15,11 @@
     flake = false;
   };
 
+  inputs.fenix = {
+    url = "github:nix-community/fenix";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+
   inputs.treefmt-nix = {
     url = "github:numtide/treefmt-nix";
     inputs.nixpkgs.follows = "nixpkgs";
@@ -26,6 +31,7 @@
       nixpkgs,
       nix,
       nix-eval-jobs,
+      fenix,
       treefmt-nix,
       ...
     }:
@@ -66,18 +72,20 @@
         });
 
       treefmtConfig =
+        system:
         { ... }:
         {
           projectRootFile = "flake.lock";
           programs.rustfmt = {
             enable = true;
-            edition = "2024";
+            package = fenix.packages.${system}.latest.rustfmt;
           };
           programs.nixfmt.enable = true;
           programs.taplo.enable = true;
         };
 
-      treefmtEval = system: treefmt-nix.lib.evalModule nixpkgs.legacyPackages.${system} treefmtConfig;
+      treefmtEval =
+        system: treefmt-nix.lib.evalModule nixpkgs.legacyPackages.${system} (treefmtConfig system);
     in
     rec {
 
@@ -174,6 +182,7 @@
             hydra-linters
             hydra-queue-runner
             ;
+          nightly-rustfmt = fenix.packages.${system}.latest.rustfmt;
         };
       });
 

flake.nix

@@ -5,6 +5,7 @@
   hydra-manual,
   hydra-linters,
   hydra-queue-runner,
+  nightly-rustfmt,
 }:
 
 let
@@ -40,14 +41,12 @@ hydra.overrideAttrs (
     src = null;
     sourceRoot = null;
 
-    nativeBuildInputs =
-      collectInputs "nativeBuildInputs"
-      ++ (with pkgs; [
-        clippy
-        nixfmt
-        rustfmt
-        taplo
-      ]);
+    nativeBuildInputs = collectInputs "nativeBuildInputs" ++ [
+      pkgs.clippy
+      pkgs.nixfmt
+      nightly-rustfmt
+      pkgs.taplo
+    ];
     buildInputs = collectInputs "buildInputs";
 
     inherit (hydra-tests) OPENLDAP_ROOT;

packaging/dev-shell.nix

@@ -1,7 +1,7 @@
 [package]
 name                   = "binary-cache"
 version                = "0.1.0"
-edition                = "2024"
+edition.workspace      = true
 license                = "LGPL-2.1-only"
 rust-version.workspace = true
 

subprojects/crates/binary-cache/Cargo.toml

@@ -28,7 +28,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let stats = client.s3_stats();
     tracing::info!(
-        "stats: put={}, put_bytes={}, put_time_ms={}, get={}, get_bytes={}, get_time_ms={}, head={}",
+        "stats: put={}, put_bytes={}, put_time_ms={}, get={}, get_bytes={}, get_time_ms={}, \
+         head={}",
         stats.put,
         stats.put_bytes,
         stats.put_time_ms,

subprojects/crates/binary-cache/examples/download_file.rs

@@ -26,7 +26,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let stats = client.s3_stats();
     tracing::info!(
-        "stats: put={}, put_bytes={}, put_time_ms={}, get={}, get_bytes={}, get_time_ms={}, head={}",
+        "stats: put={}, put_bytes={}, put_time_ms={}, get={}, get_bytes={}, get_time_ms={}, \
+         head={}",
         stats.put,
         stats.put_bytes,
         stats.put_time_ms,

subprojects/crates/binary-cache/examples/query_missing_paths.rs

@@ -1,6 +1,9 @@
+use binary_cache::{
+    PresignedUploadClient,
+    S3BinaryCacheClient,
+    path_to_narinfo,
+};
 use futures::stream::StreamExt as _;
-
-use binary_cache::{PresignedUploadClient, S3BinaryCacheClient, path_to_narinfo};
 use harmonia_utils_hash::fmt::CommonHash as _;
 use nix_utils::BaseStore as _;
 

subprojects/crates/binary-cache/examples/simple_presigned.rs

@@ -17,7 +17,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let stats = client.s3_stats();
     tracing::info!(
-        "stats: put={}, put_bytes={}, put_time_ms={}, get={}, get_bytes={}, get_time_ms={}, head={}",
+        "stats: put={}, put_bytes={}, put_time_ms={}, get={}, get_bytes={}, get_time_ms={}, \
+         head={}",
         stats.put,
         stats.put_bytes,
         stats.put_time_ms,