Skip to content
Snippets Groups Projects

rename insert_delete → insert_delete_insert; add new insert_delete matching delete_insert

Merged Ralf Jung requested to merge ralf/insert_delete into master
All threads resolved!

As discussed this is currently inconsistent.

I propose we use insert_delete for the lemma with a precondition since it is used 7 times in std++ after this MR; the one without a precondition is used just 3 times (one of which is to prove insert_delete).

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
  • LGTM modulo nit.

  • Ralf Jung added 1 commit

    added 1 commit

    Compare with previous version

  • Robbert Krebbers resolved all threads

    resolved all threads

  • Can you rebase? There's conflicts in the CHANGELOG. Thanks :).

  • Ralf Jung added 5 commits

    added 5 commits

    • 2f6b9769...e3800ea7 - 3 commits from branch master
    • 942c669a - rename insert_delete → insert_delete_insert; add new insert_delete matching delete_insert
    • cffd6689 - changelog

    Compare with previous version

  • Author Owner

    done.

  • Author Owner

    @robbertkrebbers said

    I let you merge it when you have time to fix the reverse deps. I might be able to help, but not today.

  • merged

  • Ralf Jung mentioned in commit fe3b9967

    mentioned in commit fe3b9967

  • Author Owner

    @iris-users this renames an existing lemma

    - Rename `insert_delete` → `insert_delete_insert`; add new `insert_delete` that
      is consistent with `delete_insert`.

    sed script

    sed -i -E 's/\binsert_delete\b/insert_delete_insert/g' $(find theories -name "*.v")
  • Please register or sign in to reply
    Loading