From 44e335e0b039009fc5fdb98a0317d76afcfbb107 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Thu, 29 Aug 2024 16:05:01 -0400
Subject: [PATCH] feat: move hmap-fls to Fiber.Fls

---
 src/fib/fiber.ml  | 2 --
 src/fib/fiber.mli | 6 ------
 src/fib/fls.ml    | 1 +
 src/fib/fls.mli   | 8 ++++++++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/fib/fiber.ml b/src/fib/fiber.ml
index b5daff35..bd2a11ab 100644
--- a/src/fib/fiber.ml
+++ b/src/fib/fiber.ml
@@ -330,5 +330,3 @@ let yield () : unit =
     check_if_cancelled_ self;
     PF.yield ();
     check_if_cancelled_ self
-
-include Hmap_fls
diff --git a/src/fib/fiber.mli b/src/fib/fiber.mli
index f83dd2ad..0da300e7 100644
--- a/src/fib/fiber.mli
+++ b/src/fib/fiber.mli
@@ -147,9 +147,3 @@ val spawn_ignore : ?protect:bool -> (unit -> _) -> unit
 (** [spawn_ignore f] is [ignore (spawn f)].
   The fiber will still affect termination of the parent, ie. the
   parent will exit only after this new fiber exits. *)
-
-(** {2 Local [Hmap.t]} *)
-
-include module type of struct
-  include Hmap_fls
-end
diff --git a/src/fib/fls.ml b/src/fib/fls.ml
index ed2162c4..8fd4d6ee 100644
--- a/src/fib/fls.ml
+++ b/src/fib/fls.ml
@@ -1 +1,2 @@
 include Task_local_storage
+include Hmap_fls
diff --git a/src/fib/fls.mli b/src/fib/fls.mli
index 35210a8d..2d942304 100644
--- a/src/fib/fls.mli
+++ b/src/fib/fls.mli
@@ -17,3 +17,11 @@
 include module type of struct
   include Task_local_storage
 end
+
+(** {2 Local [Hmap.t]}
+
+    This requires [hmap] to be installed. *)
+
+include module type of struct
+  include Hmap_fls
+end