Merge pull request #946 from gpetiot/fix-944

Remove 'Unresolved_apply' errors

Author: Julow

src/xref2/errors.ml

@@ -27,7 +27,6 @@ module Tools_error = struct
     [ `Local of
       Env.t * Ident.path_module
       (* Internal error: Found local path during lookup *)
-    | `Unresolved_apply (* [`Apply] argument is not [`Resolved] *)
     | `Find_failure
     | (* Internal error: the module was not found in the parent signature *)
       `Lookup_failure of
@@ -136,7 +135,6 @@ module Tools_error = struct
     | `LocalMT (_, id) -> Format.fprintf fmt "Local id found: %a" Ident.fmt id
     | `Local (_, id) -> Format.fprintf fmt "Local id found: %a" Ident.fmt id
     | `LocalType (_, id) -> Format.fprintf fmt "Local id found: %a" Ident.fmt id
-    | `Unresolved_apply -> Format.fprintf fmt "Unresolved apply"
     | `Find_failure -> Format.fprintf fmt "Find failure"
     | `Lookup_failure m ->
         Format.fprintf fmt "Lookup failure (module): %a"
@@ -189,7 +187,6 @@ let is_unexpanded_module_type_of =
     | `Local _ -> false
     | `Find_failure -> false
     | `Lookup_failure _ -> false
-    | `Unresolved_apply -> false
     | `Lookup_failure_root _ -> false
     | `Parent p -> inner (p :> any)
     | `Parent_sig p -> inner (p :> any)

src/xref2/tools.ml

@@ -951,7 +951,8 @@ and resolve_module :
             match handle_apply ~mark_substituted env func_path' arg_path' m with
             | Ok (p, m) -> Ok (p, Component.Delayed.put_val m)
             | Error e -> Error (`Parent (`Parent_expr e)))
-        | _ -> Error `Unresolved_apply)
+        | Error e, _ -> Error e
+        | _, Error e -> Error e)
     | `Identifier (i, hidden) ->
         of_option ~error:(`Lookup_failure i) (Env.(lookup_by_id s_module) i env)
         >>= fun (`Module (_, m)) ->

test/xref2/dune

@@ -19,6 +19,13 @@
  (enabled_if
   (>= %{ocaml_version} 4.06.0)))
 
+; 4.07.0 and above
+
+(cram
+ (applies_to github_issue_944)
+ (enabled_if
+  (>= %{ocaml_version} 4.07.0)))
+
 ; 4.08.0 and above
 
 (cram

test/xref2/github_issue_944.t/foo.mli

@@ -0,0 +1 @@
+val f : Set.Make(String).t -> unit

test/xref2/github_issue_944.t/run.t

@@ -0,0 +1,9 @@
+A quick test to repro the issue found in #944
+
+  $ ocamlc -bin-annot -c foo.mli
+
+  $ odoc compile foo.cmti
+  $ odoc link foo.odoc --enable-missing-root-warning
+  File "foo.odoc":
+  Warning: Couldn't find the following modules:
+    Stdlib