8 files changed, 37 insertions, 32 deletions
diff --git a/plugins/extraction/json.ml b/plugins/extraction/json.ml
index fba6b7c780..912a20f389 100644
--- a/plugins/extraction/json.ml
+++ b/plugins/extraction/json.ml
@@ -16,7 +16,10 @@ let json_bool b =
   if b then str "true" else str "false"
 
 let json_global typ ref =
-  json_str (Common.pp_global typ ref)
+  if is_custom ref then
+    json_str (find_custom ref)
+  else
+    json_str (Common.pp_global typ ref)
 
 let json_id id =
   json_str (Id.to_string id)
diff --git a/plugins/funind/gen_principle.ml b/plugins/funind/gen_principle.ml
index 6011af74e5..0452665585 100644
--- a/plugins/funind/gen_principle.ml
+++ b/plugins/funind/gen_principle.ml
@@ -234,23 +234,6 @@ let change_property_sort evd toSort princ princName =
     )
     (List.map (fun d -> Termops.map_rel_decl EConstr.Unsafe.to_constr d) princ_info.Tactics.params)
 
-(* XXX: To be cleaned up soon in favor of common save path. *)
-let save name const ?hook uctx scope kind =
-  let open Declare in
-  let open DeclareDef in
-  let fix_exn = Future.fix_exn_of const.Declare.proof_entry_body in
-  let r = match scope with
-    | Discharge ->
-      let c = SectionLocalDef const in
-      let () = declare_variable ~name ~kind c in
-      GlobRef.VarRef name
-    | Global local ->
-      let kn = declare_constant ~name ~kind ~local (DefinitionEntry const) in
-      GlobRef.ConstRef kn
-  in
-  DeclareDef.Hook.(call ?hook ~fix_exn { S.uctx; obls = []; scope; dref = r });
-  definition_message name
-
 let generate_functional_principle (evd: Evd.evar_map ref)
     interactive_proof
     old_princ_type sorts new_princ_name funs i proof_tac
@@ -307,7 +290,14 @@ let generate_functional_principle (evd: Evd.evar_map ref)
      Don't forget to close the goal if an error is raised !!!!
   *)
   let uctx = Evd.evar_universe_context sigma in
-  save new_princ_name entry ~hook uctx (DeclareDef.Global Declare.ImportDefaultBehavior) Decls.(IsProof Theorem)
+  let hook_data = hook, uctx, [] in
+  let _ : Names.GlobRef.t = DeclareDef.declare_definition
+      ~name:new_princ_name ~hook_data
+      ~scope:(DeclareDef.Global Declare.ImportDefaultBehavior)
+      ~kind:Decls.(IsProof Theorem)
+      UnivNames.empty_binders
+      entry [] in
+  ()
   with e when CErrors.noncritical e ->
     raise (Defining_principle e)
 
diff --git a/plugins/funind/indfun_common.ml b/plugins/funind/indfun_common.ml
index 80fc64fe65..b55d8537d6 100644
--- a/plugins/funind/indfun_common.ml
+++ b/plugins/funind/indfun_common.ml
@@ -10,8 +10,6 @@ let mk_correct_id id = Nameops.add_suffix (mk_rel_id id) "_correct"
 let mk_complete_id id = Nameops.add_suffix (mk_rel_id id) "_complete"
 let mk_equation_id id = Nameops.add_suffix id "_equation"
 
-let msgnl m = ()
-
 let fresh_id avoid s = Namegen.next_ident_away_in_goal (Id.of_string s) (Id.Set.of_list avoid)
 
 let fresh_name avoid s = Name (fresh_id avoid s)
diff --git a/plugins/funind/indfun_common.mli b/plugins/funind/indfun_common.mli
index cd5202a6c7..550f727951 100644
--- a/plugins/funind/indfun_common.mli
+++ b/plugins/funind/indfun_common.mli
@@ -9,9 +9,6 @@ val mk_correct_id : Id.t -> Id.t
 val mk_complete_id : Id.t -> Id.t
 val mk_equation_id : Id.t -> Id.t
 
-
-val msgnl : Pp.t -> unit
-
 val fresh_id : Id.t list -> string -> Id.t
 val fresh_name : Id.t list -> string -> Name.t
 val get_name : Id.t list -> ?default:string -> Name.t -> Name.t
diff --git a/plugins/funind/recdef.ml b/plugins/funind/recdef.ml
index 4c5eab1a9b..29356df81d 100644
--- a/plugins/funind/recdef.ml
+++ b/plugins/funind/recdef.ml
@@ -1539,13 +1539,7 @@ let recursive_definition ~interactive_proof ~is_mes function_name rec_impls type
       generate_induction_principle f_ref tcc_lemma_constr
         functional_ref eq_ref rec_arg_num
         (EConstr.of_constr rec_arg_type)
-        (nb_prod evd (EConstr.of_constr res)) relation;
-      Flags.if_verbose
-        msgnl (h 1 (Ppconstr.pr_id function_name ++
-                         spc () ++ str"is defined" )++ fnl () ++
-                    h 1 (Ppconstr.pr_id equation_id ++
-                           spc () ++ str"is defined" )
-      )
+        (nb_prod evd (EConstr.of_constr res)) relation
   in
   (* XXX STATE Why do we need this... why is the toplevel protection not enough *)
   funind_purify (fun () ->
diff --git a/plugins/micromega/ZifyBool.v b/plugins/micromega/ZifyBool.v
index 03a7774a31..b94b74097b 100644
--- a/plugins/micromega/ZifyBool.v
+++ b/plugins/micromega/ZifyBool.v
@@ -42,6 +42,16 @@ Instance Op_orb : BinOp orb :=
     TBOpInj := ltac:(destruct n,m; reflexivity)}.
 Add BinOp Op_orb.
 
+Instance Op_implb : BinOp implb :=
+  { TBOp := fun x y => Z.max (1 - x) y;
+    TBOpInj := ltac:(destruct n,m; reflexivity) }.
+Add BinOp Op_implb.
+
+Instance Op_xorb : BinOp xorb :=
+  { TBOp := fun x y => Z.max (x - y) (y - x);
+    TBOpInj := ltac:(destruct n,m; reflexivity) }.
+Add BinOp Op_xorb.
+
 Instance Op_negb : UnOp negb :=
   { TUOp := fun x => 1 - x ; TUOpInj := ltac:(destruct x; reflexivity)}.
 Add UnOp Op_negb.
diff --git a/plugins/ssr/ssrfun.v b/plugins/ssr/ssrfun.v
index dc774e811e..b8affba541 100644
--- a/plugins/ssr/ssrfun.v
+++ b/plugins/ssr/ssrfun.v
@@ -56,6 +56,10 @@ Require Import ssreflect.
                     Structure inference, as in the implementation of
                     the mxdirect predicate in matrix.v.
 
+ - The empty type:
+            void == a notation for the Empty_set type of the standard library.
+       of_void T == the canonical injection void -> T.
+
  - Sigma types:
            tag w == the i of w : {i : I & T i}.
         tagged w == the T i component of w : {i : I & T i}.
@@ -483,6 +487,12 @@ Arguments idfun {T} x /.
 
 Definition phant_id T1 T2 v1 v2 := phantom T1 v1 -> phantom T2 v2.
 
+(** The empty type. **)
+
+Notation void := Empty_set.
+
+Definition of_void T (x : void) : T := match x with end.
+
 (**  Strong sigma types.  **)
 
 Section Tag.
@@ -642,6 +652,9 @@ End Injections.
 Lemma Some_inj {T : nonPropType} : injective (@Some T).
 Proof. by move=> x y []. Qed.
 
+Lemma of_voidK T : pcancel (of_void T) [fun _ => None].
+Proof. by case. Qed.
+
 (**  cancellation lemmas for dependent type casts. **)
 Lemma esymK T x y : cancel (@esym T x y) (@esym T y x).
 Proof. by case: y /. Qed.
diff --git a/plugins/syntax/r_syntax.ml b/plugins/syntax/r_syntax.ml
index 66db924051..70c1077106 100644
--- a/plugins/syntax/r_syntax.ml
+++ b/plugins/syntax/r_syntax.ml
@@ -102,7 +102,7 @@ let bigint_of_z c = match DAst.get c with
 let rdefinitions = ["Coq";"Reals";"Rdefinitions"]
 let r_modpath = MPfile (make_dir rdefinitions)
 let r_base_modpath = MPdot (r_modpath, Label.make "RbaseSymbolsImpl")
-let r_path = make_path rdefinitions "R"
+let r_path = make_path ["Coq";"Reals";"Rdefinitions";"RbaseSymbolsImpl"] "R"
 
 let glob_IZR = GlobRef.ConstRef (Constant.make2 r_modpath @@ Label.make "IZR")
 let glob_Rmult = GlobRef.ConstRef (Constant.make2 r_base_modpath @@ Label.make "Rmult")