4.02 compat: Prefix Result and remove new syntaxes

Author: Julow

src/html/config.mli

@@ -3,9 +3,7 @@
 type t
 
 val v :
-  ?search_result:bool
-    (** Indicates whether this is a summary for a search result.
-     In that case, the links will be printed as regular text. *) ->
+  ?search_result:bool ->
   ?theme_uri:Types.uri ->
   ?support_uri:Types.uri ->
   ?search_uris:Types.file_uri list ->
@@ -16,6 +14,8 @@ val v :
   as_json:bool ->
   unit ->
   t
+(** [search_result] indicates whether this is a summary for a search result. In
+    that case, the links will be printed as regular text. *)
 
 val theme_uri : t -> Types.uri
 

src/odoc/bin/main.ml

@@ -405,7 +405,7 @@ module Indexing = struct
     let output = output_file ~dst in
     match (inputs_in_file, inputs) with
     | [], [] ->
-        Error
+        Result.Error
           (`Msg
             "At least one of --file-list or an .odocl file must be passed to \
              odoc compile-index")
@@ -762,8 +762,7 @@ module Odoc_html_args = struct
              else Relative (conv_rel_file str))
       in
       let printer ppf = function
-        | Odoc_html.Types.((Absolute uri : file_uri)) ->
-            Format.pp_print_string ppf uri
+        | Odoc_html.Types.Absolute uri -> Format.pp_print_string ppf uri
         | Odoc_html.Types.Relative _uri -> Format.pp_print_string ppf ""
       in
       (parser, printer)

src/search/html.ml

@@ -14,7 +14,7 @@ let url id =
           ~indent:false ~flat:false ~open_details:false ~as_json:false ()
       in
       let url = Odoc_html.Link.href ~config ~resolve:(Base "") url in
-      Ok url
+      Result.Ok url
   | Error _ as e -> e
 
 let map_option f = function Some x -> Some (f x) | None -> None

src/search/html.mli

@@ -6,7 +6,7 @@ val of_entry : Entry.t -> html list
 
 val url :
   Odoc_model.Paths.Identifier.Any.t ->
-  (string, Odoc_document.Url.Error.t) result
+  (string, Odoc_document.Url.Error.t) Result.result
 
 (** The below is intended for search engine that do not use the Json output but
     Odoc as a library. Most search engine will use their own representation 

src/search/json_index/json_display.ml

@@ -2,12 +2,12 @@ open Odoc_search
 
 let of_entry { Entry.id; doc = _; kind = _ } h =
   match Html.url id with
-  | Ok url ->
+  | Result.Ok url ->
       let html =
         h
         |> List.map (fun html ->
                Format.asprintf "%a" (Tyxml.Html.pp_elt ()) html)
         |> String.concat ""
       in
-      Ok (`Object [ ("url", `String url); ("html", `String html) ])
+      Result.Ok (`Object [ ("url", `String url); ("html", `String html) ])
   | Error _ as e -> e

src/search/json_index/json_display.mli

@@ -3,4 +3,4 @@ open Odoc_search
 val of_entry :
   Entry.t ->
   Html.html list ->
-  (Odoc_html.Json.json, Odoc_document.Url.Error.t) result
+  (Odoc_html.Json.json, Odoc_document.Url.Error.t) Result.result

src/search/json_index/json_search.ml

@@ -168,8 +168,8 @@ let of_entry ({ Entry.id; doc; kind } as entry) html =
           ]
   in
   match Json_display.of_entry entry html with
-  | Ok display ->
-      Ok
+  | Result.Ok display ->
+      Result.Ok
         (`Object
           [ ("id", j_id); ("doc", doc); ("kind", kind); ("display", display) ])
   | Error _ as e -> e

src/xref2/tools.ml

@@ -1254,7 +1254,7 @@ and resolve_type :
 and resolve_datatype :
     Env.t -> add_canonical:bool -> Cpath.datatype -> resolve_datatype_result =
  fun env ~add_canonical p ->
-  let ( >>> ) = Option.bind in
+  let ( >>> ) = OptionMonad.bind in
   let rec id_datatype_of_type (id : Odoc_model.Comment.Identifier.Id.path_type)
       : Odoc_model.Comment.Identifier.Id.path_datatype option =
     match id with