Move the results lib into Caml

The result name is taken by other libs hence it breaks `jbuilder utop`. Hence we
simply move it our stdlib overlay. The -open flag is used to avoid having to
modify vendored code.

bootstrap.ml

@@ -29,8 +29,7 @@ end
 
 (* Directories with library names *)
 let dirs =
-  [ "src/stdune/caml/result" , Some "Result"
-  ; "src/stdune/caml"        , Some "Caml"
+  [ "src/stdune/caml"        , Some "Caml"
   ; "src/stdune"             , Some "Stdune"
   ; "src/fiber"              , Some "Fiber"
   ; "src/xdg"                , Some "Xdg"

src/fiber/fiber.mli

@@ -1,5 +1,7 @@
 (** Concurrency library *)
 
+open Stdune
+
 (** {1 Generals} *)
 
 (** Type of fiber. A fiber represent a suspended computation. Note that using the same

src/stdune/caml/caml.ml

@@ -1,5 +1,6 @@
 module Filename = Filename
 module String   = String
+module Result   = Result
 
 type ('a, 'error) result = ('a, 'error) Result.t =
   | Ok    of 'a

src/stdune/caml/jbuild

@@ -1,4 +1,3 @@
 (library
  ((name caml)
-  (synopsis "Wrapped version of the OCaml stdlib")
-  (libraries (result))))
+  (synopsis "Wrapped version of the OCaml stdlib")))

src/stdune/caml/result/jbuild

@@ -1,5 +0,0 @@
-(jbuild_version 1)
-
-(library
- ((name     result)
-  (synopsis "Result type library")))

vendor/cmdliner/src/jbuild

@@ -2,5 +2,5 @@
 
 (library
  ((name jbuilder_cmdliner)
-  (libraries (result))
-  (flags (-w -3-6-27-32-33-35-50))))
+  (libraries (caml))
+  (flags (-w -3-6-27-32-33-35-50 -open Caml))))