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.

Sign up for GitHub

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

Jump to bottom

Prefer ErrorCall to ErrorCallWithLocation #10404

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Prefer ErrorCall to ErrorCallWithLocation #10404

merged 1 commit into from
Oct 1, 2024

Conversation

alt-romes
Copy link
Collaborator

@alt-romes alt-romes commented Oct 1, 2024 •
edited by ulysses4ever
Loading

This future proofs the code for CLC#285, which will remove ErrorCallWithLocation to de-duplicate duplicate CallStacks.

ErrorCall is already a pattern synonym with the same meaning as it will have in the future, so this change is backwards compatible too.

Please read Github PR Conventions and then fill in one of these two templates.

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

@alt-romes
Prefer ErrorCall to ErrorCallWithLocation
db683f2 
This future proofs the code for CLC#285, which will remove
`ErrorCallWithLocation` to de-duplicate duplicate CallStacks.

ErrorCall is already a pattern synonym with the same meaning as it will
have in the future, so this change is backwards compatible too.
Kleidukos
Kleidukos approved these changes Oct 1, 2024
View reviewed changes
Copy link
Member

@Kleidukos Kleidukos left a comment

Choose a reason for hiding this comment

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

Excellent, thank you very much.

@alt-romes
Copy link
Collaborator Author

Thank you all for the fast response!

@alt-romes alt-romes added the merge me Tell Mergify Bot to merge label Oct 1, 2024
@alt-romes
Copy link
Collaborator Author

alt-romes commented Oct 1, 2024 •
edited
Loading

Is there any chance we could skip the merge delay here?
Unfortunately there's little time to the first alpha release, and having this land in Cabal would help me speed it up! Also, this change seems especially uncontroversial :)

(Aside: I would be happy to have your comments on the CLC proposal, if any)

@geekosaur geekosaur added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Oct 1, 2024
@geekosaur
Copy link
Collaborator

Done.

@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Oct 1, 2024
@mergify mergify bot merged commit 97ebb32 into haskell:master Oct 1, 2024
49 checks passed
@Kleidukos
Copy link
Member

@Mergifyio backport 3.12

@mergify Mergify
Copy link
Contributor

mergify bot commented Oct 2, 2024 •
edited
Loading

backport 3.12

✅ Backports have been created

@mergify mergify bot mentioned this pull request Oct 2, 2024
Merged
1 task
@Kleidukos
Copy link
Member

Kleidukos commented Oct 2, 2024 •
edited
Loading

@Mergifyio backport 3.14

@Kleidukos Kleidukos mentioned this pull request Oct 2, 2024
Open
20 tasks
@mergify Mergify
Copy link
Contributor

mergify bot commented Oct 2, 2024 •
edited
Loading

backport 3.14

✅ Backports have been created

@mergify mergify bot mentioned this pull request Oct 2, 2024
Merged
1 task
@ulysses4ever
Copy link
Collaborator

Don't want to sound boring but it'd be good to leave actual hyperlinks for things like CLC#285. I fixed it in the PR description, bit the commit message will go in the history without a link.

@geekosaur
Copy link
Collaborator

Agreed. Also, please remove the backport labels, or at least do so for 3.12, if you do the backport: they're my to-do list.

@Kleidukos
Copy link
Member

@geekosaur not sure I understand, the two backports have been created already, for 3.12 and 3.14.

@geekosaur
Copy link
Collaborator

geekosaur commented Oct 2, 2024 •
edited
Loading

yes, so I removed the labels so they don't show up when I next scan for backports to be done.

Sometimes I just do the backport immediately, but often I need to fix conflicts so I generally label them for when I have time to deal.

@Kleidukos
Copy link
Member

ok I see, thank you for the clarification.

mergify bot added a commit that referenced this pull request Oct 2, 2024
@mergify
Merge pull request #10410 from haskell/mergify/bp/3.12/pr-10404
45ba6dc 
Prefer ErrorCall to ErrorCallWithLocation (backport #10404)
mergify bot added a commit that referenced this pull request Oct 2, 2024
@mergify
Merge pull request #10411 from haskell/mergify/bp/3.14/pr-10404
3ade64c 
Prefer ErrorCall to ErrorCallWithLocation (backport #10404)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geekosaur geekosaur geekosaur approved these changes

@Kleidukos Kleidukos Kleidukos approved these changes

@ffaf1 ffaf1 ffaf1 approved these changes

@ulysses4ever ulysses4ever Awaiting requested review from ulysses4ever

Assignees
No one assigned
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@alt-romes @geekosaur @Kleidukos @ulysses4ever @ffaf1