Skip to content

Fix name clash in guard clauses#4358

Merged
JordanMartinez merged 2 commits intopurescript:0.15.4-nextfrom
vtrl:fix-4357
Jun 30, 2022
Merged

Fix name clash in guard clauses#4358
JordanMartinez merged 2 commits intopurescript:0.15.4-nextfrom
vtrl:fix-4357

Conversation

@purefunctor
Copy link
Copy Markdown
Member

@purefunctor purefunctor commented Jun 28, 2022

Description of the change

Fixes #4357. Should we make a hotfix release for this?

Checklist:

  • Added a file to CHANGELOG.d for this PR (see CHANGELOG.d/README.md)
  • Added myself to CONTRIBUTORS.md (if this is my first contribution)
  • Linked any existing issues or proposals that this pull request should close
  • Updated or added relevant documentation
  • Added a test for the contribution (if applicable)

@purefunctor purefunctor requested a review from rhendric June 28, 2022 04:44
@JordanMartinez
Copy link
Copy Markdown
Contributor

JordanMartinez commented Jun 28, 2022

I'd be up for a hotfix. Right now, master includes #4341, so perhaps this PR should be rebased on top of 0.15.3 and we release the result as 0.15.4?

rhendric
rhendric approved these changes Jun 28, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@rhendric rhendric left a comment

Choose a reason for hiding this comment

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

Looks correct; here are some optional cleanup suggestions.

@purefunctor
Copy link
Copy Markdown
Member Author

purefunctor commented Jun 29, 2022 •
edited
Loading

so perhaps this PR should be rebased on top of 0.15.3 and we release the result as 0.15.4?

How would we go about doing so?

@JordanMartinez
Copy link
Copy Markdown
Contributor

JordanMartinez commented Jun 29, 2022

so perhaps this PR should be rebased on top of 0.15.3 and we release the result as 0.15.4?

How would we go about doing so?

I believe we'd do the same thing we did in the 0.14.9 release: https://github.com/purescript/purescript/tree/continue-v0.14.x

We'd create a branch that starts on 0.15.3 called 0.15.4-next, reimplement this PR and merge it to that branch, bump the version of that branch to 0.15.4 and merge the PR, and then make a GH release targeting that branch (rather than master).

Per the table in #4303, I don't think there is anything else to do after that?

@purefunctor purefunctor changed the base branch from master to 0.15.4-next June 30, 2022 02:47
@purefunctor
Copy link
Copy Markdown
Member Author

purefunctor commented Jun 30, 2022

I've rebased this PR to build on v0.15.3 and changed the target to 0.15.4-next. This should be ready for a merge and release.

@JordanMartinez JordanMartinez merged commit de6809b into purescript:0.15.4-next Jun 30, 2022
@purefunctor purefunctor deleted the fix-4357 branch June 30, 2022 12:15
purefunctor added a commit that referenced this pull request Jul 1, 2022
@JordanMartinez @purefunctor
Merge 0.15.4-next branch (#4361)
f707042 
* Fix name clash in guard clauses (#4358)

* Bump version to 0.15.4

Co-authored-by: Justin Garcia <functor@duck.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rhendric rhendric rhendric approved these changes

+1 more reviewer

@JordanMartinez JordanMartinez JordanMartinez approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Variable names clashing across guard clauses

3 participants

@purefunctor @JordanMartinez @rhendric