enjoy jbuilding

Author: trefis

src/docOckHtml.ml

@@ -2,16 +2,8 @@ open DocOck
 open Types
 open Tyxml.Html
 
-module Html_tree = DocOckHtmlHtml_tree
-module Markup = DocOckHtmlMarkup
-module Url = DocOckHtmlUrl
-
-let html_dot_magic = List.map ~f:(fun x -> tot @@ toelt x)
-
-let rec list_keep_while ~pred = function
-  | x :: xs when pred x -> x :: list_keep_while ~pred xs
-  | _ -> []
-
+(* Why is this unused all of the sudden? *)
+(*
 module Html_parser = struct
   let mk_attr ((_, local), value) = Xml.string_attrib local value
 
@@ -26,6 +18,7 @@ module Html_parser = struct
     )
     |> tot
 end
+*)
 
 type kind =
   | Phrasing : Html_types.phrasing elt list -> kind
@@ -40,9 +33,9 @@ let to_phrasing : kind -> Html_types.phrasing elt list = function
   | Phrasing_without_interactive l -> (l :> Html_types.phrasing elt list)
   | Phrasing l -> l
   | Newline [] -> []
-  | Newline l -> invalid_arg "to_phrasing"
-  | Flow5 l -> invalid_arg "to_phrasing"
-  | Flow5_without_interactive l -> invalid_arg "to_phrasing"
+  | Newline _ -> invalid_arg "to_phrasing"
+  | Flow5 _ -> invalid_arg "to_phrasing"
+  | Flow5_without_interactive _ -> invalid_arg "to_phrasing"
 
 let to_flow5 : kind -> Html_types.flow5 elt list = function
   | Phrasing l -> (l :> Html_types.flow5 elt list)
@@ -59,9 +52,9 @@ let to_flow5_without_interactive
     (l :> Html_types.flow5_without_interactive elt list)
   | Flow5_without_interactive l -> l
   | Newline [] -> []
-  | Newline l -> invalid_arg "to_flow5_without_interactive"
-  | Flow5 l -> invalid_arg "to_flow5_without_interactive"
-  | Phrasing l -> invalid_arg "to_flow5_without_interactive"
+  | Newline _ -> invalid_arg "to_flow5_without_interactive"
+  | Flow5 _ -> invalid_arg "to_flow5_without_interactive"
+  | Phrasing _ -> invalid_arg "to_flow5_without_interactive"
 
 let is_interactive = function
   | Phrasing _ -> true
@@ -115,7 +108,7 @@ module Reference = struct
       | SubstAlias(_, r) -> render_resolved r
       | Module (r, s) -> render_resolved r ^ "." ^ s
       | Canonical (_, Reference.Resolved r) -> render_resolved r
-      | Canonical (p, p') -> render_resolved p
+      | Canonical (p, _) -> render_resolved p
       | ModuleType (r, s) -> render_resolved r ^ "." ^ s
       | Type (r, s) -> render_resolved r ^ "." ^ s
       | Constructor (r, s) -> render_resolved r ^ "." ^ s
@@ -257,8 +250,8 @@ let paragraphise_without_interactive lst =
     | Phrasing_without_interactive l -> [p l]
     | Flow5_without_interactive l -> (l :> Html_types.flow5 elt list)
     | Newline _ -> []
-    | Phrasing l -> invalid_arg "paragraphise_without_interactive"
-    | Flow5 l -> invalid_arg "paragraphise_without_interactive"
+    | Phrasing _ -> invalid_arg "paragraphise_without_interactive"
+    | Flow5 _ -> invalid_arg "paragraphise_without_interactive"
   )
 
 let make_li_without_interactive = function
@@ -539,7 +532,7 @@ let handle_tags ~get_package tags =
       | Canonical _ -> [] (* TODO: display? *)
     )
   in
-  let cleaned = List.filter (function [] -> false | _ -> true) raw in
+  let cleaned = List.filter ~f:(function [] -> false | _ -> true) raw in
   match cleaned with
   | [] -> []
   | lst -> [ ul ~a:[ a_class ["at-tag"] ] (List.map lst ~f:make_li) ]

src/docOckHtml.mli

@@ -15,7 +15,6 @@
  *)
 
 open Tyxml.Html
-module Url = DocOckHtmlUrl
 
 type kind = [ `Arg | `Mod | `Mty | `Class | `Cty ]
 
@@ -56,8 +55,6 @@ module Relative_link = struct
     val href : get_package:('a -> string) -> stop_before:bool ->
       ('a, _) Identifier.t -> string
   end = struct
-    open Identifier
-
     exception Not_linkable
 
     let rec drop_shared_prefix l1 l2 =
@@ -70,7 +67,7 @@ module Relative_link = struct
 
     let href ~get_package ~stop_before id =
       match Url.from_identifier ~get_package ~stop_before id with
-      | Ok { Url. page; anchor } ->
+      | Ok { Url. page; anchor; _ } ->
         let target = List.rev (if !semantic_uris then page else "index.html" :: page) in
         let current_loc = List.map ~f:stack_elt_to_path_fragment (stack_to_list path) in
         let current_from_common_ancestor, target_from_common_ancestor =
@@ -127,12 +124,12 @@ module Relative_link = struct
       | "" -> suffix
       | _  -> prefix ^ "." ^ suffix
 
-    let rec render_raw : type a. (_, _) Identifier.t -> (_, a, _) Fragment.raw -> string =
+    let rec _render_raw : type a. (_, _) Identifier.t -> (_, a, _) Fragment.raw -> string =
       fun id fragment ->
         let open Fragment in
         match fragment with
         | Resolved rr -> render_resolved id rr
-        | Dot (prefix, suffix) -> dot (render_raw id prefix) suffix
+        | Dot (prefix, suffix) -> dot (_render_raw id prefix) suffix
 
     and render_resolved : type a. (_, _) Identifier.t -> (_, a, _) Fragment.Resolved.raw -> string =
       fun id fragment ->
@@ -224,7 +221,7 @@ class page_creator ?kind ~path content =
       ]
 
     method heading : Html_types.h1_content_fun elt list =
-      DocOckHtmlMarkup.keyword (
+      Markup.keyword (
         match kind with
         | None
         | Some `Mod -> "Module"
@@ -233,7 +230,7 @@ class page_creator ?kind ~path content =
         | Some `Cty -> "Class type"
         | Some `Class -> "Class"
       ) :: pcdata " " ::
-      [DocOckHtmlMarkup.module_path (List.tl path)]
+      [Markup.module_path (List.tl path)]
 
     method content : Html_types.div_content_fun elt list =
       let up_href =

src/docOckHtmlDocumentation.ml renamed to src/documentation.ml

@@ -15,11 +15,8 @@
  *)
 
 open DocOck
-open Types
 open Paths
 
-open Tyxml.Html
-
 let functor_arg_pos { Types.FunctorArgument.id ; _ } =
   match id with
   | Identifier.Argument (_, nb, _) -> nb
@@ -32,7 +29,7 @@ let rec unit ~package (t : _ Types.Unit.t) : string list =
   let rest =
     match t.content with
     | Module sign -> signature ~prefix:name sign
-    | Pack   pack -> []
+    | Pack _ -> []
   in
   name :: rest
 
@@ -41,15 +38,15 @@ and signature ~prefix (t : _ Types.Signature.t) =
     List.map t ~f:(function
       | Types.Signature.Module md -> module_ ~prefix md
       | ModuleType mty -> module_type ~prefix mty
-      | Type td -> []
-      | TypExt te -> []
-      | Exception e -> []
-      | Value v -> []
-      | External e -> []
-      | Class c -> []
-      | ClassType cty -> []
+      | Type _ -> []
+      | TypExt _ -> []
+      | Exception _ -> []
+      | Value _ -> []
+      | External _ -> []
+      | Class _ -> []
+      | ClassType _ -> []
       | Include incl -> include_ ~prefix incl
-      | Comment (Documentation doc) -> []
+      | Comment (Documentation _) -> []
       | Comment Stop -> []
     )
   )

src/docOckHtmlDocumentation.mli renamed to src/documentation.mli

@@ -15,11 +15,10 @@
  *)
 
 open Tyxml.Html
-module Url = DocOckHtmlUrl
 
 let keyword keyword = span ~a:[ a_class ["keyword"] ] [ pcdata keyword ]
 let module_path ids =
-  span ~a:[ a_class ["module-path"] ] [pcdata (String.concat "." ids)]
+  span ~a:[ a_class ["module-path"] ] [pcdata (String.concat ~sep:"." ids)]
 
 module Type = struct
   let path p = span ~a:[ a_class ["type-id"] ] p