File tree Expand file tree Collapse file tree 3 files changed +5
-12
lines changed Expand file tree Collapse file tree 3 files changed +5
-12
lines changed Original file line number Diff line number Diff line change 2
2
3
3
let of_dune_build dir =
4
4
let contents =
5
- Bos.OS.Dir. fold_contents ~dotfiles: true
6
- (fun p acc -> p :: acc)
7
- []
8
- Fpath. (v dir)
5
+ Bos.OS.Dir. fold_contents ~dotfiles: true (fun p acc -> p :: acc) [] dir
9
6
in
10
7
match contents with
11
8
| Error _ -> Util.StringMap. empty
@@ -37,7 +34,7 @@ let of_dune_build dir =
37
34
let cmtidir =
38
35
Fpath. (path / Printf. sprintf " .%s.objs" libname / " byte" )
39
36
in
40
- match Fpath. rem_prefix ( Fpath. v dir) path with
37
+ match Fpath. rem_prefix dir path with
41
38
| Some pkg_dir ->
42
39
( pkg_dir,
43
40
Packages.Lib. v pkg_dir
Original file line number Diff line number Diff line change
1
+ val of_dune_build : Fpath .t -> Packages .set
Original file line number Diff line number Diff line change @@ -558,13 +558,8 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
558
558
ignore indexes
559
559
560
560
let fpath_arg =
561
- let parse s =
562
- match Fpath. of_string s with
563
- | Ok v -> Ok v
564
- | Error (`Msg m ) -> Error (`Msg m)
565
- in
566
561
let print ppf v = Fpath. pp ppf v in
567
- Arg. conv (parse , print)
562
+ Arg. conv (Fpath. of_string , print)
568
563
569
564
let odoc_dir =
570
565
let doc = " Directory in which the intermediate odoc files go" in
@@ -617,7 +612,7 @@ let blessed =
617
612
618
613
let dune_style =
619
614
let doc = " Dune style" in
620
- Arg. (value & opt (some string ) None & info [ " dune-style" ] ~doc )
615
+ Arg. (value & opt (some fpath_arg ) None & info [ " dune-style" ] ~doc )
621
616
622
617
let cmd =
623
618
let doc = " Generate odoc documentation" in
You can’t perform that action at this time.
0 commit comments