Support compiling against result library

Author: lukemaurer

src/model/semantics.ml

@@ -300,7 +300,7 @@ let tag :
     Ast.ocamldoc_tag ->
     ( Comment.block_element with_location,
       internal_tags_removed with_location )
-    Result.result =
+    Result.t =
  fun ~location status tag ->
   if not status.tags_allowed then
     (* Trigger a warning but do not remove the tag. Avoid turning tags into

src/odoc/extract_code.mli

@@ -4,4 +4,4 @@ val extract :
   names:string list ->
   line_directives:bool ->
   warnings_options:Odoc_model.Error.warnings_options ->
-  (unit, [> `Msg of string ]) result
+  (unit, [> `Msg of string ]) Result.t

src/odoc/or_error.ml

@@ -1,4 +1,4 @@
-type ('a, 'e) result = ('a, 'e) Result.result = Ok of 'a | Error of 'e
+type ('a, 'e) result = ('a, 'e) Result.t = Ok of 'a | Error of 'e
 
 type msg = [ `Msg of string ]
 

src/odoc/or_error.mli

@@ -1,5 +1,5 @@
 (** Re-export for compatibility with 4.02 *)
-type ('a, 'e) result = ('a, 'e) Result.result = Ok of 'a | Error of 'e
+type ('a, 'e) result = ('a, 'e) Result.t = Ok of 'a | Error of 'e
 
 type msg = [ `Msg of string ]
 

src/utils/odoc_utils.ml

@@ -1,10 +1,10 @@
 (** Re-export for compatibility with 4.02. *)
-type ('a, 'b) result = ('a, 'b) Result.result = Ok of 'a | Error of 'b
+type ('a, 'b) result = ('a, 'b) Result.t = Ok of 'a | Error of 'b
 
 (** The [result] type and a bind operator. This module is meant to be opened. *)
 module ResultMonad = struct
   (** Re-export for compat *)
-  type ('a, 'b) result = ('a, 'b) Result.result = Ok of 'a | Error of 'b
+  type ('a, 'b) result = ('a, 'b) Result.t = Ok of 'a | Error of 'b
 
   let map_error f = function Ok _ as ok -> ok | Error e -> Error (f e)
 

src/xref2/env.ml

@@ -496,7 +496,7 @@ type 'a scope = {
   root : string -> t -> 'a option;
 }
 
-type 'a maybe_ambiguous = ('a, [ 'a amb_err | `Not_found ]) Result.result
+type 'a maybe_ambiguous = ('a, [ 'a amb_err | `Not_found ]) Result.t
 
 let make_scope ?(root = fun _ _ -> None) ?check
     (filter : _ -> ([< Component.Element.any ] as 'a) option) : 'a scope =

src/xref2/env.mli

@@ -116,7 +116,7 @@ type 'a scope constraint 'a = [< Component.Element.any ]
 (** Target of a lookup *)
 
 type 'a maybe_ambiguous =
-  ('a, [ `Ambiguous of 'a * 'a list | `Not_found ]) Result.result
+  ('a, [ `Ambiguous of 'a * 'a list | `Not_found ]) Result.t
 
 val lookup_by_name : 'a scope -> string -> t -> 'a maybe_ambiguous
 (** Lookup an element in Env depending on the given [scope]. Return

src/xref2/ref_tools.ml

@@ -40,7 +40,7 @@ type fragment_type_parent_lookup_result =
   [ `S of signature_lookup_result | `T of datatype_lookup_result ]
 
 type 'a ref_result =
-  ('a, Errors.Tools_error.reference_lookup_error) Result.result
+  ('a, Errors.Tools_error.reference_lookup_error) Result.t
 (** The result type for every functions in this module. *)
 
 let kind_of_find_result = function