Skip to content

Conversation

morrisonlevi
Copy link

This is a continuation of #785 that has merged in the latest master.

There appears to be an issue with combining this with export.prefix: #785 (comment).

@morrisonlevi
Copy link
Author

morrisonlevi commented Jun 18, 2025

It seems like I've fixed the compatibility with prefixing, though there should be tests added for it.

When running it on my real codebase, I get a duplicate struct, a custom Error type. I'm trying to fix that still. It's not a generic type, nor an enum, so I'm not sure why it has issues. Making a contained reproducer has been fruitless so far.

@morrisonlevi
Copy link
Author

morrisonlevi commented Jun 23, 2025

I've added tests, still having an issue with my real-world case and finding a sharable reproducer.

Edit: the real-world issue was a mistake in that code after all! This is pretty much ready for review, once I squash commits.

Benjamin-Davies and others added 2 commits June 23, 2025 17:28
Merge generic enum tags

Remove hidden state used to merge generic tags

Remove "_Tag" suffix from external tag enum variants

Factor out Dependencies::add_path

Document merge_generic_tags
Squashed commit of the following:

commit e4561c5
Author: Levi Morrison <[email protected]>
Date:   Wed Jun 18 12:04:16 2025 -0600

    fix: cython

commit f18826b
Author: Levi Morrison <[email protected]>
Date:   Wed Jun 18 11:38:13 2025 -0600

    test: enum.merge_generic_tags and export.prefix

commit cb1f57a
Author: Levi Morrison <[email protected]>
Date:   Tue Jun 17 15:14:37 2025 -0600

    fix: whitespace

commit 04764f9
Author: Levi Morrison <[email protected]>
Date:   Tue Jun 17 14:37:14 2025 -0600

    remove unnecessary check

commit bf7c2c9
Author: Levi Morrison <[email protected]>
Date:   Tue Jun 17 14:07:07 2025 -0600

    fix: prefix with cursor

commit f33f1f4
Merge: e8373f1 8021542
Author: Levi Morrison <[email protected]>
Date:   Tue Jun 10 16:26:16 2025 -0600

    Merge branch 'master' into merge-generic-tags

commit e8373f1
Author: Benjamin Davies <[email protected]>
Date:   Thu Jun 1 18:05:04 2023 +1200

    Document merge_generic_tags

commit 27c01a4
Author: Benjamin Davies <[email protected]>
Date:   Thu Jun 1 17:05:18 2023 +1200

    Factor out Dependencies::add_path

commit 9cd7c19
Author: Benjamin Davies <[email protected]>
Date:   Tue May 30 19:53:30 2023 +1200

    Remove "_Tag" suffix from external tag enum variants

commit bdf1c26
Author: Benjamin Davies <[email protected]>
Date:   Tue May 30 19:42:21 2023 +1200

    Remove hidden state used to merge generic tags

commit 57330a8
Author: Benjamin Davies <[email protected]>
Date:   Wed Sep 14 18:33:05 2022 +1200

    Merge generic enum tags
@morrisonlevi
Copy link
Author

I've squashed Ben's commits, and my own, so this can go cleanly into master once reviewed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants