Skip to content
Snippets Groups Projects
Commit afe73d88 authored by Robbert Krebbers's avatar Robbert Krebbers
Browse files

Bump Iris.

parent 10100614
No related branches found
No related tags found
No related merge requests found
Pipeline #51326 passed
......@@ -9,5 +9,5 @@ build: [make "-j%{jobs}%"]
install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/actris" ]
depends: [
"coq-iris-heap-lang" { (= "dev.2021-07-19.3.ce8bd0c6") | (= "dev") }
"coq-iris-heap-lang" { (= "dev.2021-07-26.8.eb05e835") | (= "dev") }
]
......@@ -160,7 +160,7 @@ Section mapper.
iIntros (ys'). iDestruct 1 as (Hys) "Hcsort"; simplify_eq/=.
rewrite -assoc_L. iApply ("HΦ" $! (map x ++ ys') with "[$Hcsort]").
iPureIntro. rewrite (gmultiset_disj_union_difference {[+ x +]} X)
-?gmultiset_elem_of_singleton_subseteq //.
?gmultiset_singleton_subseteq_l //.
rewrite (comm_L disj_union) gmultiset_elements_disj_union.
by rewrite gmultiset_elements_singleton assoc_L bind_app -Hys /= right_id_L comm.
Qed.
......@@ -266,7 +266,7 @@ Section mapper.
iIntros (zs'); iDestruct 1 as (Hzs) "HIC"; simplify_eq/=.
iApply ("HΦ" $! (zs' ++ red i ys)). iSplit; last by rewrite -assoc_L.
iPureIntro. rewrite (gmultiset_disj_union_difference {[+ (i,ys) +]} Y)
-?gmultiset_elem_of_singleton_subseteq //.
?gmultiset_singleton_subseteq_l //.
rewrite (comm_L disj_union) gmultiset_elements_disj_union.
rewrite gmultiset_elements_singleton assoc_L Hzs !bind_app /=.
by rewrite right_id_L !assoc_L.
......
......@@ -187,7 +187,7 @@ Section map.
iIntros (ys'); iDestruct 1 as (Hys) "Hk"; simplify_eq/=.
iApply ("HΦ" $! (ys' ++ map x)). iSplit.
+ iPureIntro. rewrite (gmultiset_disj_union_difference {[+ x +]} X)
-?gmultiset_elem_of_singleton_subseteq //.
?gmultiset_singleton_subseteq_l //.
rewrite (comm_L disj_union) gmultiset_elements_disj_union.
by rewrite gmultiset_elements_singleton assoc_L bind_app -Hys /= right_id_L.
+ by rewrite -assoc_L.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment