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.
This commit is contained in:
parent
338f4c9ff2
commit
48ca91e013
|
@ -29,8 +29,7 @@ end
|
||||||
|
|
||||||
(* Directories with library names *)
|
(* Directories with library names *)
|
||||||
let dirs =
|
let dirs =
|
||||||
[ "src/stdune/caml/result" , Some "Result"
|
[ "src/stdune/caml" , Some "Caml"
|
||||||
; "src/stdune/caml" , Some "Caml"
|
|
||||||
; "src/stdune" , Some "Stdune"
|
; "src/stdune" , Some "Stdune"
|
||||||
; "src/fiber" , Some "Fiber"
|
; "src/fiber" , Some "Fiber"
|
||||||
; "src/xdg" , Some "Xdg"
|
; "src/xdg" , Some "Xdg"
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
(** Concurrency library *)
|
(** Concurrency library *)
|
||||||
|
|
||||||
|
open Stdune
|
||||||
|
|
||||||
(** {1 Generals} *)
|
(** {1 Generals} *)
|
||||||
|
|
||||||
(** Type of fiber. A fiber represent a suspended computation. Note that using the same
|
(** Type of fiber. A fiber represent a suspended computation. Note that using the same
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
module Filename = Filename
|
module Filename = Filename
|
||||||
module String = String
|
module String = String
|
||||||
|
module Result = Result
|
||||||
|
|
||||||
type ('a, 'error) result = ('a, 'error) Result.t =
|
type ('a, 'error) result = ('a, 'error) Result.t =
|
||||||
| Ok of 'a
|
| Ok of 'a
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
(library
|
(library
|
||||||
((name caml)
|
((name caml)
|
||||||
(synopsis "Wrapped version of the OCaml stdlib")
|
(synopsis "Wrapped version of the OCaml stdlib")))
|
||||||
(libraries (result))))
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
|
||||||
((name result)
|
|
||||||
(synopsis "Result type library")))
|
|
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name jbuilder_cmdliner)
|
((name jbuilder_cmdliner)
|
||||||
(libraries (result))
|
(libraries (caml))
|
||||||
(flags (-w -3-6-27-32-33-35-50))))
|
(flags (-w -3-6-27-32-33-35-50 -open Caml))))
|
||||||
|
|
Loading…
Reference in New Issue