Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge API tweaks #5277

Merged
merged 5 commits into from
Aug 13, 2024
Merged

merge API tweaks #5277

merged 5 commits into from
Aug 13, 2024

Conversation

mitchellwrosen
Copy link
Member

Overview

This PR contains a small number of tweaks to the merge API from the last round of review:

  1. Reuse unique type GUIDs rather than make up new ones.
  2. Remove requirement to provide a UniqueName to the parser.
  3. Distinguish between term and type dependencies (for the step of merge that needs to make a TypeLookup.

Other misc cleanup: deleted a couple unused record fields.

@@ -1024,7 +1024,7 @@ Bob, meanwhile, first deletes the term, then sort of deletes the type and re-add
``` ucm
project/bob> view Foo.Bar

type Foo.Bar = Hello Nat Nat | Baz Nat
Copy link
Member Author

Choose a reason for hiding this comment

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

These are expected because we're reusing an existing unique type GUID, which affects constructor ordering.

@mitchellwrosen mitchellwrosen marked this pull request as ready for review August 13, 2024 18:40
@aryairani aryairani merged commit f2adc77 into trunk Aug 13, 2024
35 checks passed
@aryairani aryairani deleted the 24-08-13-merge-tweaks branch August 13, 2024 19:50
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