Skip to content
Snippets Groups Projects

Make the elements of gset persistent by changing the core

Merged Make the elements of gset persistent by changing the core
amintimany/iris-coq:master into master
1 unresolved thread
Merged Amin Timany requested to merge amintimany/iris-coq:master into master
1 unresolved thread

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
algebra/gset.v
54 53 intros; apply local_update_total; split; [done|]; simpl.
55 54 intros mZ _. rewrite !gset_opM=> HX. by rewrite (comm_L _ X) -!assoc_L HX.
56 55 Qed.
56
57 Global Instance gmap_persistent X : Persistent X.
  • Amin Timany Added 2 commits:

    Added 2 commits:

    • 2c64b551 - Correct the name gmap_persistent -> gset_persistent
    • bfad9bff - In gset idemp_L rather than union_idem_L
  • Robbert Krebbers mentioned in commit 06c4bfe2

    mentioned in commit 06c4bfe2

  • Robbert Krebbers Status changed to merged

    Status changed to merged

  • Robbert Krebbers
    Robbert Krebbers @robbertkrebbers ·
    Owner

    Thank you, I have accepted the merge request.

    PS: only after accepting I noticed this merge request consisted out of 21 commits. The next time, could you create a merge request that contains just a couple of commits, instead of one that contains many commits corresponding to merging branches.

    PS2: Is gitlab able to squash a merge request consisting of many commits into one, or so? @jung

  • Ghost User
    Ghost User @ghost ·
    Contributor

    I usually use git command git rebase -i --autosquash origin/master to do this. Not sure if gitlab has such functionality.

  • Amin Timany
    Amin Timany @amintimany ·
    Author Developer

    Thanks for the merge. Sorry, I will remember to clean up my pull requests.

  • Ralf Jung
    Ralf Jung @jung ·
    Owner

    I guess you have to search the GItLab UI for a squash button (before merging ;), I am no wiser than you here.

    • Please register or sign in to reply