Merge branch 'master' of https://gitlab.mpi-sws.org/FP/iris-coq

theories/algebra/deprecated.v

@@ -50,6 +50,8 @@ Qed.
 Canonical Structure dec_agreeR : cmraT :=
   discreteR (dec_agree A) dec_agree_ra_mixin.
 
+Global Instance dec_agree_cmra_discrete : CMRADiscrete dec_agreeR.
+Proof. apply discrete_cmra_discrete. Qed.
 Global Instance dec_agree_total : CMRATotal dec_agreeR.
 Proof. intros x. by exists x. Qed.
 

theories/proofmode/class_instances.v

@@ -10,16 +10,18 @@ Context {M : ucmraT}.
 Implicit Types P Q R : uPred M.
 
 (* FromAssumption *)
-Global Instance from_assumption_False p P : FromAssumption p False P.
-Proof. destruct p; rewrite /FromAssumption /= ?always_pure; apply False_elim. Qed.
-Global Instance from_assumption_exact p P : FromAssumption p P P.
+Global Instance from_assumption_exact p P : FromAssumption p P P | 0.
 Proof. destruct p; by rewrite /FromAssumption /= ?always_elim. Qed.
-Global Instance from_assumption_always_l p P Q :
-  FromAssumption p P Q → FromAssumption p (□ P) Q.
-Proof. rewrite /FromAssumption=><-. by rewrite always_elim. Qed.
+Global Instance from_assumption_False p P : FromAssumption p False P | 1.
+Proof. destruct p; rewrite /FromAssumption /= ?always_pure; apply False_elim. Qed.
+
 Global Instance from_assumption_always_r P Q :
   FromAssumption true P Q → FromAssumption true P (□ Q).
 Proof. rewrite /FromAssumption=><-. by rewrite always_always. Qed.
+
+Global Instance from_assumption_always_l p P Q :
+  FromAssumption p P Q → FromAssumption p (□ P) Q.
+Proof. rewrite /FromAssumption=><-. by rewrite always_elim. Qed.
 Global Instance from_assumption_later p P Q :
   FromAssumption p P Q → FromAssumption p P (▷ Q)%I.
 Proof. rewrite /FromAssumption=>->. apply later_intro. Qed.

theories/proofmode/classes.v

@@ -5,7 +5,9 @@ Import uPred.
 Class FromAssumption {M} (p : bool) (P Q : uPred M) :=
   from_assumption : □?p P ⊢ Q.
 Arguments from_assumption {_} _ _ _ {_}.
-Hint Mode FromAssumption + + ! - : typeclass_instances.
+(* No need to restrict Hint Mode, we have a default instance that will always
+be used in case of evars *)
+Hint Mode FromAssumption + + - - : typeclass_instances.
 
 Class IntoPure {M} (P : uPred M) (φ : Prop) := into_pure : P ⊢ ⌜φ⌝.
 Arguments into_pure {_} _ _ {_}.

theories/proofmode/tactics.v

@@ -441,7 +441,7 @@ Tactic Notation "iApply" open_constr(lem) :=
       |lazy beta (* reduce betas created by instantiation *)]
     |iSpecializePat H "[]"; last go H] in
   iPoseProofCore lem as false true (fun H =>
-    first [iExact H|go H|iTypeOf H (fun Q => fail 1 "iApply: cannot apply" Q)]).
+    first [iExact H|go H|iTypeOf H (fun _ Q => fail "iApply: cannot apply" Q)]).
 
 (** * Revert *)
 Local Tactic Notation "iForallRevert" ident(x) :=