Merge PR #11269: Several cleanups and factorization in scheme declarations

Reviewed-by: SkySkimmer
Reviewed-by: ejgallego

2 files changed, 11 insertions, 11 deletions

diff --git a/vernac/auto_ind_decl.ml b/vernac/auto_ind_decl.ml
index 310ea62a1d..f954915cf8 100644
--- a/vernac/auto_ind_decl.ml
+++ b/vernac/auto_ind_decl.ml
@@ -430,7 +430,7 @@ let do_replace_lb mode lb_scheme_key aavoid narg p q =
   end
 
 (* used in the bool -> leb side *)
-let do_replace_bl mode bl_scheme_key (ind,u as indu) aavoid narg lft rgt =
+let do_replace_bl bl_scheme_key (ind,u as indu) aavoid narg lft rgt =
   let open EConstr in
   let avoid = Array.of_list aavoid in
   let do_arg sigma hd v offset =
@@ -658,7 +658,7 @@ repeat ( apply andb_prop in z;let z1:= fresh "Z" in destruct z as [z1 z]).
                               if GlobRef.equal (GlobRef.IndRef indeq) Coqlib.(lib_ref "core.eq.type")
                               then
                                 Tacticals.New.tclTHEN
-                                  (do_replace_bl mode bl_scheme_key ind
+                                  (do_replace_bl bl_scheme_key ind
                                      (!avoid)
                                      nparrec (ca.(2))
                                      (ca.(1)))
diff --git a/vernac/indschemes.ml b/vernac/indschemes.ml
index b2e1a5e796..2f0b1062a7 100644
--- a/vernac/indschemes.ml
+++ b/vernac/indschemes.ml
@@ -210,7 +210,7 @@ let declare_one_case_analysis_scheme ind =
        induction scheme, the other ones share the same code with the
        appropriate type *)
   if Sorts.family_leq InType kelim then
-    ignore (define_individual_scheme dep UserAutomaticRequest None ind)
+    define_individual_scheme dep UserAutomaticRequest None ind
 
 (* Induction/recursion schemes *)
 
@@ -248,7 +248,7 @@ let declare_one_induction_scheme ind =
        else if depelim then kinds_from_type
        else nondep_kinds_from_type)
   in
-  List.iter (fun kind -> ignore (define_individual_scheme kind UserAutomaticRequest None ind))
+  List.iter (fun kind -> define_individual_scheme kind UserAutomaticRequest None ind)
     elims
 
 let declare_induction_schemes kn =
@@ -264,7 +264,7 @@ let declare_induction_schemes kn =
 let declare_eq_decidability_gen internal names kn =
   let mib = Global.lookup_mind kn in
   if mib.mind_finite <> Declarations.CoFinite then
-    ignore (define_mutual_scheme eq_dec_scheme_kind internal names kn)
+    define_mutual_scheme eq_dec_scheme_kind internal names kn
 
 let eq_dec_scheme_msg ind = (* TODO: mutual inductive case *)
   str "Decidable equality on " ++ quote (Printer.pr_inductive (Global.env()) ind)
@@ -280,14 +280,14 @@ let try_declare_eq_decidability kn =
 let declare_eq_decidability = declare_eq_decidability_scheme_with []
 
 let ignore_error f x =
-  try ignore (f x) with e when CErrors.noncritical e -> ()
+  try f x with e when CErrors.noncritical e -> ()
 
 let declare_rewriting_schemes ind =
   if Hipattern.is_inductive_equality ind then begin
-    ignore (define_individual_scheme rew_r2l_scheme_kind UserAutomaticRequest None ind);
-    ignore (define_individual_scheme rew_r2l_dep_scheme_kind UserAutomaticRequest None ind);
-    ignore (define_individual_scheme rew_r2l_forward_dep_scheme_kind
-      UserAutomaticRequest None ind);
+    define_individual_scheme rew_r2l_scheme_kind UserAutomaticRequest None ind;
+    define_individual_scheme rew_r2l_dep_scheme_kind UserAutomaticRequest None ind;
+    define_individual_scheme rew_r2l_forward_dep_scheme_kind
+      UserAutomaticRequest None ind;
     (* These ones expect the equality to be symmetric; the first one also *)
     (* needs eq *)
     ignore_error (define_individual_scheme rew_l2r_scheme_kind UserAutomaticRequest None) ind;
@@ -310,7 +310,7 @@ let declare_congr_scheme ind =
       try Coqlib.check_required_library Coqlib.logic_module_name; true
       with e when CErrors.noncritical e -> false
     then
-      ignore (define_individual_scheme congr_scheme_kind UserAutomaticRequest None ind)
+      define_individual_scheme congr_scheme_kind UserAutomaticRequest None ind
     else
       warn_cannot_build_congruence ()
   end