diff --git a/theories/base_logic/derived.v b/theories/base_logic/derived.v index 5b1521234df9946d8f53dd3609586738f9342251..65187b820e61951340e7a812ab64671f96316524 100644 --- a/theories/base_logic/derived.v +++ b/theories/base_logic/derived.v @@ -29,8 +29,8 @@ Notation "◇ P" := (uPred_except_0 P) Instance: Params (@uPred_except_0) 1. Typeclasses Opaque uPred_except_0. -Class Timeless {M} (P : uPred M) := timelessP : ▷ P ⊢ ◇ P. -Arguments timelessP {_} _ {_}. +Class Timeless {M} (P : uPred M) := timeless : ▷ P ⊢ ◇ P. +Arguments timeless {_} _ {_}. Hint Mode Timeless + ! : typeclass_instances. Instance: Params (@Timeless) 1. @@ -908,7 +908,7 @@ Proof. Qed. Global Instance valid_timeless {A : cmraT} `{CmraDiscrete A} (a : A) : Timeless (✓ a : uPred M)%I. -Proof. rewrite /Timeless !discrete_valid. apply (timelessP _). Qed. +Proof. rewrite /Timeless !discrete_valid. apply (timeless _). Qed. Global Instance and_timeless P Q: Timeless P → Timeless Q → Timeless (P ∧ Q). Proof. intros; rewrite /Timeless except_0_and later_and; auto. Qed. Global Instance or_timeless P Q : Timeless P → Timeless Q → Timeless (P ∨ Q). @@ -951,11 +951,11 @@ Global Instance persistently_if_timeless p P : Timeless P → Timeless (□?p P) Proof. destruct p; apply _. Qed. Global Instance eq_timeless {A : ofeT} (a b : A) : Discrete a → Timeless (a ≡ b : uPred M)%I. -Proof. intros. rewrite /Timeless !discrete_eq. apply (timelessP _). Qed. +Proof. intros. rewrite /Timeless !discrete_eq. apply (timeless _). Qed. Global Instance ownM_timeless (a : M) : Discrete a → Timeless (uPred_ownM a). Proof. intros ?. rewrite /Timeless later_ownM. apply exist_elim=> b. - rewrite (timelessP (a≡b)) (except_0_intro (uPred_ownM b)) -except_0_and. + rewrite (timeless (a≡b)) (except_0_intro (uPred_ownM b)) -except_0_and. apply except_0_mono. rewrite internal_eq_sym. apply impl_elim_r'. apply: internal_eq_rewrite. Qed. diff --git a/theories/proofmode/class_instances.v b/theories/proofmode/class_instances.v index 04429acfb169f0b2e3152978cc9128e371110d33..d6abc608cb2d044e564138d30016e6ddbf279343 100644 --- a/theories/proofmode/class_instances.v +++ b/theories/proofmode/class_instances.v @@ -871,7 +871,7 @@ Qed. Global Instance elim_modal_timeless_bupd P Q : Timeless P → IsExcept0 Q → ElimModal (▷ P) P Q Q. Proof. - intros. rewrite /ElimModal (except_0_intro (_ -∗ _)) (timelessP P). + intros. rewrite /ElimModal (except_0_intro (_ -∗ _)) (timeless P). by rewrite -except_0_sep wand_elim_r. Qed. Global Instance elim_modal_timeless_bupd' p P Q :