sgrondin / hl_yaml Goto Github PK

diff --git a/src/hl_yaml.ml b/src/hl_yaml.ml
index 4df4fa0..5dbcd8b 100644
--- a/src/hl_yaml.ml
+++ b/src/hl_yaml.ml
@@ -504,11 +504,11 @@ module type Intf_Eio = sig
 end
 
 module Make_Eio (Eio : S.S_Eio) :
-  Intf_Eio with type 'a io := 'a and type filepath := Eio.Fs.dir_ty Eio.Path.t = struct
+  Intf_Eio with type 'a io := 'a and type filepath := [`Dir] Eio.Path.t = struct
   module M = Make (struct
     include Non_Monadic
 
-    type filepath = Eio.Fs.dir_ty Eio.Path.t
+    type filepath = [`Dir] Eio.Path.t
 
     let read_file filepath = Eio.Path.load filepath
   end)
diff --git a/src/hl_yaml.mli b/src/hl_yaml.mli
index 3de5259..09d8172 100644
--- a/src/hl_yaml.mli
+++ b/src/hl_yaml.mli
@@ -93,4 +93,4 @@ module type Intf_Eio = sig
 end
 
 module Make_Eio : functor (Eio : S.S_Eio) ->
-  Intf_Eio with type 'a io := 'a and type filepath := Eio.Fs.dir_ty Eio.Path.t
+  Intf_Eio with type 'a io := 'a and type filepath := [`Dir] Eio.Path.t
diff --git a/src/s.ml b/src/s.ml
index 4863f42..9507a2c 100644
--- a/src/s.ml
+++ b/src/s.ml
@@ -40,24 +40,8 @@ module type S_Lwt_io = sig
 end
 
 module type S_Eio = sig
-  module Resource : sig
-    type ('t, -'tags) handler
-
-    type -'tags t = T : ('t * ('t, 'tags) handler) -> 'tags t
-  end
-
-  module Std : sig
-    type 'a r = 'a Resource.t
-  end
-
-  module Fs : sig
-    type dir_ty = [ `Dir ]
-
-    type 'a dir = ([> dir_ty ] as 'a) Std.r
-  end
-
   module Path : sig
-    type 'a t = 'a Fs.dir * string
+    type 'a t constraint 'a = [> `Dir]
 
     val load : 'a t -> string
 
-- 
2.39.2