Skip to content

Conversation

andreasabel
Copy link
Member

@andreasabel andreasabel commented Oct 7, 2025

Commits:

  • Simplify Sublist/Heterogeneous/antisym: collapse two cases:
    Removes an unnecessary case split.

  • Simplify Sublist/Heterogeneous/antisym: factor out contradiction:
    Pulls the duplicated proof into a lemma.

These can be squashed, but I worked in two steps since I am unsure about the style policy.

Copy link
Contributor

@MatthewDaggitt MatthewDaggitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from that looks good to me!

@MatthewDaggitt MatthewDaggitt added this to the v2.4 milestone Oct 7, 2025
Copy link
Contributor

@jamesmckinna jamesmckinna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpicks (mostly cosmetic), but using implicits/variables makes proofs more robust (I think!?)

@jamesmckinna
Copy link
Contributor

@andreasabel I would merge with my suggestions, unless you feel strongly that they make things worse?

Separately, you allude to (the possibility of) a default squash/merge policy for stdlib, and my git fu is weak in this regard: AFAIU, we squash commits while merging, but I'm conscious also that this is not the case for the main Agda codebase.

I'd be grateful for pointers to how to understand the trade offs between these approaches, and what conclusions, if any, we might draw for stdlib maintenance/development?

@andreasabel
Copy link
Member Author

I committed your suggestions, thanks!

Merging by rebase would preserve the original commits. We do this in the Agda codebase if they are all meaningful and pass the build (and maybe the tests) individually. This can have the advantage of smaller commits too look at when bisecting which commit introduced a bug.
However, for the standard library there is probably no gain from small commits, so squashing is fine as default policy.

@jamesmckinna jamesmckinna added this pull request to the merge queue Oct 8, 2025
Merged via the queue into master with commit a7aac85 Oct 8, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants