From f14b6f1a17652566f0cbc00ce81421ba0684dad5 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Mon, 27 Jun 2016 11:03:43 +0200
Subject: errors.ml renamed into cErrors.ml (avoid clash with an OCaml
 compiler-lib module)

 For the moment, there is an Error module in compilers-lib/ocamlbytecomp.cm(x)a
---
 tools/coqdep.ml   | 4 ++--
 tools/coqmktop.ml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/coqdep.ml b/tools/coqdep.ml
index 9886b263cb..a7c32e1d65 100644
--- a/tools/coqdep.ml
+++ b/tools/coqdep.ml
@@ -495,7 +495,7 @@ let coqdep () =
     add_rec_dir_import (fun _ -> add_caml_known) "theories" ["Coq"];
     add_rec_dir_import (fun _ -> add_caml_known) "plugins" ["Coq"];
   end else begin
-    Envars.set_coqlib ~fail:Errors.error;
+    Envars.set_coqlib ~fail:CErrors.error;
     let coqlib = Envars.coqlib () in
     add_rec_dir_import add_coqlib_known (coqlib//"theories") ["Coq"];
     add_rec_dir_import add_coqlib_known (coqlib//"plugins") ["Coq"];
@@ -525,6 +525,6 @@ let coqdep () =
 let _ =
   try
     coqdep ()
-  with Errors.UserError(s,p) ->
+  with CErrors.UserError(s,p) ->
     let pp = if s <> "_" then Pp.(str s ++ str ": " ++ p) else p in
     Feedback.msg_error pp
diff --git a/tools/coqmktop.ml b/tools/coqmktop.ml
index 6f3d8e2b8f..eaf938e8ce 100644
--- a/tools/coqmktop.ml
+++ b/tools/coqmktop.ml
@@ -235,7 +235,7 @@ let declare_loading_string () =
 \n     Mltop.set_top\
 \n       {Mltop.load_obj=\
 \n         (fun f -> if not (Topdirs.load_file ppf f)\
-\n                   then Errors.error (\"Could not load plugin \"^f));\
+\n                   then CErrors.error (\"Could not load plugin \"^f));\
 \n        Mltop.use_file=Topdirs.dir_use ppf;\
 \n        Mltop.add_dir=Topdirs.dir_directory;\
 \n        Mltop.ml_loop=(fun () -> Toploop.loop ppf) };;\
@@ -265,7 +265,7 @@ let create_tmp_main_file modules =
 let main () =
   let (options, userfiles) = parse_args () in
   (* Directories: *)
-  let () = Envars.set_coqlib ~fail:Errors.error in
+  let () = Envars.set_coqlib ~fail:CErrors.error in
   let basedir = if !Flags.boot then None else Some (Envars.coqlib ()) in
   (* Which ocaml compiler to invoke *)
   let prog = if !opt then "opt" else "ocamlc" in
-- 
cgit v1.2.3