Merge pull request #24 from nixops4/treefmt

Format, and keep formatted

Author: roberth

dev/flake-module.nix

@@ -6,6 +6,7 @@
   imports = [
     inputs.pre-commit-hooks-nix.flakeModule
     inputs.hercules-ci-effects.flakeModule
+    inputs.treefmt-nix.flakeModule
   ];
   perSystem =
     {
@@ -17,7 +18,20 @@
     {
       nix-bindings-rust.nixPackage = inputs'.nix.packages.default;
 
-      pre-commit.settings.hooks.nixfmt-rfc-style.enable = true;
+      treefmt = {
+        # Used to find the project root
+        projectRootFile = "flake.lock";
+
+        programs.rustfmt = {
+          enable = true;
+          edition = "2021";
+        };
+        programs.nixfmt.enable = true;
+        programs.deadnix.enable = true;
+        #programs.clang-format.enable = true;
+      };
+
+      pre-commit.settings.hooks.treefmt.enable = true;
       # Temporarily disable rustfmt due to configuration issues
       # pre-commit.settings.hooks.rustfmt.enable = true;
       pre-commit.settings.settings.rust.cargoManifestPath = "./Cargo.toml";
@@ -90,7 +104,7 @@
       };
     };
   herculesCI =
-    { config, ... }:
+    { ... }:
     {
       ciSystems = [ "x86_64-linux" ];
     };

dev/flake.lock

@@ -4,6 +4,8 @@
     pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix";
     pre-commit-hooks-nix.inputs.nixpkgs.follows = "";
     hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects";
+    treefmt-nix.url = "github:numtide/treefmt-nix";
+    treefmt-nix.inputs.nixpkgs.follows = "";
   };
   outputs = { ... }: { };
 }

dev/flake.nix

@@ -11,11 +11,10 @@
   };
 
   outputs =
-    inputs@{ self, flake-parts, ... }:
+    inputs@{ flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } (
       toplevel@{
         lib,
-        withSystem,
         ...
       }:
       let
@@ -24,9 +23,7 @@
         */
         flake-parts-modules.basic =
           {
-            config,
             flake-parts-lib,
-            withSystem,
             ...
           }:
           {
@@ -114,7 +111,7 @@
         */
         flake-parts-modules.tested =
           # Consumer toplevel
-          { options, config, ... }:
+          { config, ... }:
           {
             _file = ./flake.nix;
             imports = [ flake-parts-modules.basic ];
@@ -177,10 +174,7 @@
         ];
         perSystem =
           {
-            config,
-            self',
             inputs',
-            pkgs,
             ...
           }:
           {

flake.nix

@@ -1,9 +1,7 @@
 {
   perSystem =
     {
-      lib,
       config,
-      pkgs,
       ...
     }:
     {

nci.nix

@@ -138,7 +138,9 @@ use nix_bindings_bindgen_raw as raw;
 use nix_bindings_store::path::StorePath;
 use nix_bindings_store::store::{Store, StoreWeak};
 use nix_bindings_util::context::Context;
-use nix_bindings_util::string_return::{callback_get_result_string, callback_get_result_string_data};
+use nix_bindings_util::string_return::{
+    callback_get_result_string, callback_get_result_string_data,
+};
 use nix_bindings_util::{check_call, check_call_opt_key, result_string_init};
 use std::ffi::{c_char, CString};
 use std::iter::FromIterator;
@@ -1217,7 +1219,8 @@ pub fn test_init() {
     // which causes an error. So we set a custom build dir here.
     // Only available on linux
     if cfg!(target_os = "linux") {
-        nix_bindings_util::settings::set("sandbox-build-dir", "/custom-build-dir-for-test").unwrap();
+        nix_bindings_util::settings::set("sandbox-build-dir", "/custom-build-dir-for-test")
+            .unwrap();
     }
     std::env::set_var("_NIX_TEST_NO_SANDBOX", "1");
 
@@ -1784,9 +1787,7 @@ mod tests {
         gc_registering_current_thread(|| {
             let store = Store::open(None, HashMap::new()).unwrap();
             let mut es = EvalState::new(store, []).unwrap();
-            let v = es
-                .eval_from_string("[ ]", "<test>")
-                .unwrap();
+            let v = es.eval_from_string("[ ]", "<test>").unwrap();
             es.force(&v).unwrap();
             let t = es.value_type_unforced(&v);
             assert!(t == Some(ValueType::List));

nix-bindings-expr/src/eval_state.rs

@@ -45,7 +45,10 @@ impl FlakeSettings {
 
 pub trait EvalStateBuilderExt {
     /// Configures the eval state to provide flakes features such as `builtins.getFlake`.
-    fn flakes(self, settings: &FlakeSettings) -> Result<nix_bindings_expr::eval_state::EvalStateBuilder>;
+    fn flakes(
+        self,
+        settings: &FlakeSettings,
+    ) -> Result<nix_bindings_expr::eval_state::EvalStateBuilder>;
 }
 impl EvalStateBuilderExt for nix_bindings_expr::eval_state::EvalStateBuilder {
     /// Configures the eval state to provide flakes features such as `builtins.getFlake`.