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

Registered the NamedDefaults language extension #9740

Merged
merged 5 commits into from
Apr 12, 2024
Merged

Registered the NamedDefaults language extension #9740

merged 5 commits into from
Apr 12, 2024

Conversation

blamario
Copy link
Contributor

@blamario blamario commented Feb 24, 2024 •
edited
Loading

This is a sibling PR to GHC's !11853

  • GHC issue #24305
  • implementing GHC proposal 409

geekosaur
geekosaur requested changes Feb 24, 2024
View reviewed changes
Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

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

You have a failing test that appears to need an updated hash?

@blamario
Copy link
Contributor Author

That's been fixed with a manual push to https://gitlab.haskell.org/ghc/packages/Cabal/-/tree/wip/exportable-named-defaults?ref_type=heads

Mikolaj
Mikolaj previously requested changes Mar 9, 2024
View reviewed changes
Copy link
Member

@Mikolaj Mikolaj left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thank you very much for the PR.

That's been fixed with a manual push to https://gitlab.haskell.org/ghc/packages/Cabal/-/tree/wip/exportable-named-defaults?ref_type=heads

I'm afraid this is not a 2-way mirror, so the push did not get reflected on github. Could you push this to github?

May I also ask you to link to the relevant GHC issue that adds this extension and check the boxes in the PR template (that would involve adding a tiny changelog file, I presume)? Would it be too much to also ask you for a courtesy towards vim users by adding the extension to their configuration as in #9502 and #8854? Thank you in advance!

@blamario blamario requested a review from Mikolaj March 9, 2024 13:39
@Mikolaj
Copy link
Member

Mikolaj commented Apr 5, 2024

Let me take the liberty of rebasing the branch in the hope CI fixes itself...

@Mikolaj
Copy link
Member

Mikolaj commented Apr 5, 2024

@mergify rebase

@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 5, 2024

rebase

✅ Branch has been successfully rebased

@Mikolaj Mikolaj force-pushed the wip/exportable-named-defaults branch from d2e3f5c to 021b6a3 Compare April 5, 2024 09:16
@Mikolaj Mikolaj dismissed their stale review April 5, 2024 15:15

The problems are gone.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 5, 2024

Oh, I see the CI fails becase the hashes of the API changed. It's enough to amend them, using the values from the failed tests, I guess. Just as in the similar PRs mentioned above.

@blamario: please let me know if this is unclear.

@blamario blamario force-pushed the wip/exportable-named-defaults branch from 9e46bbe to bae163b Compare April 5, 2024 18:41
@blamario blamario force-pushed the wip/exportable-named-defaults branch from bae163b to 9c0d504 Compare April 5, 2024 19:03
Mikolaj
Mikolaj approved these changes Apr 10, 2024
View reviewed changes
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

Thank you very much!

@Mikolaj Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Apr 10, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Apr 10, 2024

I've set a label, so this should merge in 2 days if there are no further comments/conflicts.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 10, 2024

@blamario: Just to make sure: this extension is not going to be in GHC 9.10, right?

@blamario
Copy link
Contributor Author

That's not my decision, but I don't expect so.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 12, 2024
@mergify mergify bot merged commit 00835c0 into haskell:master Apr 12, 2024
56 checks passed
@blamario blamario deleted the wip/exportable-named-defaults branch April 12, 2024 19:20
erikd pushed a commit to erikd/cabal that referenced this pull request Apr 22, 2024
@blamario @mergify @erikd
Registered the NamedDefaults language extension (haskell#9740)
d664c30 
* Registered the NamedDefaults language extension

* Added changelog and Vim configuration lines

* Updated the expected hashes

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@Kleidukos
Copy link
Member

We can't backport this one to 3.12 because of the new member in the ADT.

@ffaf1
Copy link
Collaborator

ffaf1 commented Sep 12, 2024

@mergify backport 3.14

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 12, 2024 •
edited
Loading

backport 3.14

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Sep 12, 2024
@blamario @mergify
Registered the NamedDefaults language extension (#9740)
1c89d34 
* Registered the NamedDefaults language extension

* Added changelog and Vim configuration lines

* Updated the expected hashes

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 00835c0)

# Conflicts:
#	Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
@mergify mergify bot mentioned this pull request Sep 12, 2024
Closed
5 tasks
@ffaf1 ffaf1 mentioned this pull request Sep 12, 2024
Open
20 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mikolaj Mikolaj Mikolaj approved these changes

@geekosaur geekosaur geekosaur approved these changes

Assignees
No one assigned
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@blamario @Mikolaj @Kleidukos @ffaf1 @geekosaur