From 3757fffbef2055bb479771bd8f53f90d20fac001 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Wed, 24 Jan 2024 10:00:41 +0100 Subject: [PATCH] Gently update --- .ocamlformat | 2 +- bin/dune | 8 ++++---- bin/lipap.ml | 2 +- bin/mti_gf.ml | 2 +- lib/dune | 2 +- test/test.ml | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.ocamlformat b/.ocamlformat index cbc75aa..c472f64 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,4 +1,4 @@ -version=0.24.1 +version=0.26.1 module-item-spacing=compact break-struct=natural break-infix=fit-or-vertical diff --git a/bin/dune b/bin/dune index 872463a..ac561eb 100644 --- a/bin/dune +++ b/bin/dune @@ -3,7 +3,7 @@ (public_name ptt.mti_gf) (package ptt-bin) (modules mti_gf) - (libraries bos ca-certs mirage-time-unix mirage-clock-unix dns-client.lwt + (libraries bos ca-certs mirage-time-unix mirage-clock-unix dns-client-lwt tcpip.stack-socket ptt.mti-gf logs.fmt mirage-crypto-rng)) (executable @@ -12,7 +12,7 @@ (package ptt-bin) (modules lipap) (libraries digestif.c ca-certs mirage-time-unix bos mirage-clock-unix - dns-client.lwt tcpip.stack-socket ptt.lipap logs.fmt mirage-crypto-rng)) + dns-client-lwt tcpip.stack-socket ptt.lipap logs.fmt mirage-crypto-rng)) (executable (name adduser) @@ -27,5 +27,5 @@ (public_name ptt.spf) (package ptt-bin) (modules spf) - (libraries cmdliner dns-tsig ptime.clock.os dns-client.lwt mirage-crypto-rng - tcpip.stack-socket uspf uspf.lwt dns-mirage)) + (libraries cmdliner dns-tsig ptime.clock.os dns-client-lwt mirage-crypto-rng + tcpip.stack-socket uspf uspf-lwt dns-mirage)) diff --git a/bin/lipap.ml b/bin/lipap.ml index 27d81ce..0d88cec 100644 --- a/bin/lipap.ml +++ b/bin/lipap.ml @@ -6,7 +6,7 @@ let () = Fmt.set_style_renderer Fmt.stdout `Ansi_tty let () = Fmt.set_style_renderer Fmt.stderr `Ansi_tty let () = Logs.set_level ~all:true (Some Logs.Debug) let () = Logs.set_reporter reporter -let () = Mirage_crypto_rng_unix.initialize () +let () = Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna) let ( <.> ) f g x = f (g x) module Random = struct diff --git a/bin/mti_gf.ml b/bin/mti_gf.ml index 9012fcd..66bea61 100644 --- a/bin/mti_gf.ml +++ b/bin/mti_gf.ml @@ -6,7 +6,7 @@ let () = Fmt.set_style_renderer Fmt.stdout `Ansi_tty let () = Fmt.set_style_renderer Fmt.stderr `Ansi_tty let () = Logs.set_level ~all:true (Some Logs.Debug) let () = Logs.set_reporter reporter -let () = Mirage_crypto_rng_unix.initialize () +let () = Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna) let ( <.> ) f g x = f (g x) module Random = struct diff --git a/lib/dune b/lib/dune index 2607384..af8988c 100644 --- a/lib/dune +++ b/lib/dune @@ -42,7 +42,7 @@ (name hm) (public_name ptt.hm) (modules hm) - (libraries dns-client.mirage uspf mirage-random ptt.transmit)) + (libraries dns-client-mirage uspf mirage-random ptt.transmit)) (library (name ptt_value) diff --git a/test/test.ml b/test/test.ml index 54eee02..c690c30 100644 --- a/test/test.ml +++ b/test/test.ml @@ -6,7 +6,7 @@ let () = Fmt.set_style_renderer Fmt.stdout `Ansi_tty let () = Fmt.set_style_renderer Fmt.stderr `Ansi_tty let () = Logs.set_level ~all:true (Some Logs.Debug) let () = Logs.set_reporter reporter -let () = Mirage_crypto_rng_unix.initialize () +let () = Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna) let () = Sys.set_signal Sys.sigpipe Sys.Signal_ignore module Scheduler = Colombe.Sigs.Make (struct type +'a t = 'a Lwt.t end) @@ -875,12 +875,12 @@ let full_test_0 = let romain_calascibetta = (Rresult.R.get_ok <.> Colombe_emile.to_forward_path) (let open Mrmime.Mailbox in - Local.[w "romain"; w "calascibetta"] - @ Domain.(domain, [a "gmail"; a "com"])) in + Local.[w "romain"; w "calascibetta"] + @ Domain.(domain, [a "gmail"; a "com"])) in let anil = (Rresult.R.get_ok <.> Colombe_emile.to_reverse_path) (let open Mrmime.Mailbox in - Local.[w "anil"] @ Domain.(domain, [a "recoil"; a "org"])) in + Local.[w "anil"] @ Domain.(domain, [a "recoil"; a "org"])) in let recoil = (Colombe.Domain.of_string_exn <.> Domain_name.to_string) recoil in let sendmail contents = sendmail @@ -923,16 +923,16 @@ let full_test_1 = let romain_calascibetta = (Rresult.R.get_ok <.> Colombe_emile.to_forward_path) (let open Mrmime.Mailbox in - Local.[w "romain"; w "calascibetta"] - @ Domain.(domain, [a "gmail"; a "com"])) in + Local.[w "romain"; w "calascibetta"] + @ Domain.(domain, [a "gmail"; a "com"])) in let anil = (Rresult.R.get_ok <.> Colombe_emile.to_reverse_path) (let open Mrmime.Mailbox in - Local.[w "anil"] @ Domain.(domain, [a "recoil"; a "org"])) in + Local.[w "anil"] @ Domain.(domain, [a "recoil"; a "org"])) in let thomas = (Rresult.R.get_ok <.> Colombe_emile.to_reverse_path) (let open Mrmime.Mailbox in - Local.[w "thomas"] @ Domain.(domain, [a "gazagnaire"; a "org"])) in + Local.[w "thomas"] @ Domain.(domain, [a "gazagnaire"; a "org"])) in let recoil = (Colombe.Domain.of_string_exn <.> Domain_name.to_string) recoil in let gazagnaire = (Colombe.Domain.of_string_exn <.> Domain_name.to_string) gazagnaire in