From 081ed58524da181584c29eae9582b297e4321aff Mon Sep 17 00:00:00 2001 From: Bryan Bennett Date: Tue, 18 Jun 2024 06:54:12 -0400 Subject: [PATCH] Move version pprint into Version module --- lib/flake_env__versions.re | 4 ++++ tests/flake_env_test_versions.re | 13 +------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/flake_env__versions.re b/lib/flake_env__versions.re index c36fb04..a74c98f 100644 --- a/lib/flake_env__versions.re +++ b/lib/flake_env__versions.re @@ -9,8 +9,12 @@ type t = { point: int, }; +/*** Initialize a Versions.t from major, minor, and point versions */ let init = (major, minor, point) => {major, minor, point}; +let pprint = (pp_fmt, t) => + Format.fprintf(pp_fmt, "{ %d.%d.%d }", t.major, t.minor, t.point); + let required_direnv_version = init(2, 21, 3); let required_nix_version = init(2, 10, 0); diff --git a/tests/flake_env_test_versions.re b/tests/flake_env_test_versions.re index b0f7208..ad90ff5 100644 --- a/tests/flake_env_test_versions.re +++ b/tests/flake_env_test_versions.re @@ -1,18 +1,7 @@ open Lib; -let pprint = (pp_fmt, version) => { - Versions.( - Fmt.pf( - pp_fmt, - "{ major: %d, minor: %d, point: %d }", - version.major, - version.minor, - version.point, - ) - ); -}; let testable_version = - Alcotest.testable(pprint, (a, b) => Versions.compare(a, b) == 0); + Alcotest.testable(Versions.pprint, (a, b) => Versions.compare(a, b) == 0); let check_version = Alcotest.(check(Alcotest.result(testable_version, string)));