aboutsummaryrefslogtreecommitdiff
path: root/src/Util/Option.v
diff options
context:
space:
mode:
authorGravatar Jason Gross <jgross@mit.edu>2016-10-18 17:13:27 -0400
committerGravatar Jason Gross <jgross@mit.edu>2016-10-18 17:13:27 -0400
commitad22d3d211bc84dd50cbd2259e5bb0a3fb735e88 (patch)
tree3bbf4ee2403ca70193a756d016d2a6a3a3b9028b /src/Util/Option.v
parent87673dff4d3d8464af987952a4bbcc16158ce9f2 (diff)
Fix for Coq 8.5, 8.5pl1
Diffstat (limited to 'src/Util/Option.v')
-rw-r--r--src/Util/Option.v12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Util/Option.v b/src/Util/Option.v
index 591a285ad..82ddf6750 100644
--- a/src/Util/Option.v
+++ b/src/Util/Option.v
@@ -12,22 +12,22 @@ Section Relations.
| Some ay => eq ax ay
end
end.
-
+
Local Ltac t :=
cbv; repeat (break_match || intro || intuition congruence ||
solve [ apply reflexivity
| apply symmetry; eassumption
| eapply transitivity; eassumption ] ).
-
+
Global Instance Reflexive_option_eq {T} {R} {Reflexive_R:@Reflexive T R}
: Reflexive (option_eq R). Proof. t. Qed.
-
+
Global Instance Transitive_option_eq {T} {R} {Transitive_R:@Transitive T R}
: Transitive (option_eq R). Proof. t. Qed.
-
+
Global Instance Symmetric_option_eq {T} {R} {Symmetric_R:@Symmetric T R}
: Symmetric (option_eq R). Proof. t. Qed.
-
+
Global Instance Equivalence_option_eq {T} {R} {Equivalence_R:@Equivalence T R}
: Equivalence (option_eq R). Proof. split; exact _. Qed.
End Relations.
@@ -52,7 +52,7 @@ Lemma option_rect_false_returns_true_iff
option_rect (fun _ => bool) f false o = true <-> exists s:T, option_eq R o (Some s) /\ f s = true.
Proof.
unfold option_rect; break_match; logic; [ | | congruence .. ].
- { repeat esplit; easy. }
+ { repeat esplit; simpl; easy. }
{ match goal with [H : f _ = true |- f _ = true ] =>
solve [rewrite <- H; eauto] end. }
Qed.