From 498fe5f976dc274893e045553651a1a8f0c41874 Mon Sep 17 00:00:00 2001
From: Robbert Krebbers <mail@robbertkrebbers.nl>
Date: Fri, 30 Nov 2018 11:15:52 +0100
Subject: [PATCH] Bit of clean up.

---
 theories/fin_maps.v | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/theories/fin_maps.v b/theories/fin_maps.v
index 7abefa2b..5983b55a 100644
--- a/theories/fin_maps.v
+++ b/theories/fin_maps.v
@@ -1032,7 +1032,7 @@ Proof.
 Qed.
 
 (** ** The filter operation *)
-Section map_Filter.
+Section map_filter.
   Context {A} (P : K * A → Prop) `{!∀ x, Decision (P x)}.
   Implicit Types m : M A.
 
@@ -1085,7 +1085,7 @@ Section map_Filter.
 
   Lemma map_filter_empty : filter P (∅ : M A) = ∅.
   Proof. apply map_fold_empty. Qed.
-End map_Filter.
+End map_filter.
 
 (** ** Properties of the [map_Forall] predicate *)
 Section map_Forall.
@@ -1521,19 +1521,16 @@ Proof.
 Qed.
 Global Instance: IdemP (=@{M A}) (∪).
 Proof. intros A ?. by apply union_with_idemp. Qed.
+Lemma lookup_union {A} (m1 m2 : M A) i :
+  (m1 ∪ m2) !! i = union_with (λ x _, Some x) (m1 !! i) (m2 !! i).
+Proof. apply lookup_union_with. Qed.
 Lemma lookup_union_Some_raw {A} (m1 m2 : M A) i x :
   (m1 ∪ m2) !! i = Some x ↔
     m1 !! i = Some x ∨ (m1 !! i = None ∧ m2 !! i = Some x).
-Proof.
-  unfold union, map_union, union_with, map_union_with. rewrite (lookup_merge _).
-  destruct (m1 !! i), (m2 !! i); compute; intuition congruence.
-Qed.
+Proof. rewrite lookup_union. destruct (m1 !! i), (m2 !! i); naive_solver. Qed.
 Lemma lookup_union_None {A} (m1 m2 : M A) i :
   (m1 ∪ m2) !! i = None ↔ m1 !! i = None ∧ m2 !! i = None.
-Proof.
-  unfold union, map_union, union_with, map_union_with. rewrite (lookup_merge _).
-  destruct (m1 !! i), (m2 !! i); compute; intuition congruence.
-Qed.
+Proof. rewrite lookup_union.  destruct (m1 !! i), (m2 !! i); naive_solver. Qed.
 Lemma map_positive_l {A} (m1 m2 : M A) : m1 ∪ m2 = ∅ → m1 = ∅.
 Proof.
   intros Hm. apply map_empty. intros i. apply (f_equal (!! i)) in Hm.
-- 
GitLab