Skip to content

Fix mistake in BuildInfo.Lens.hs#10609

Merged
mergify[bot] merged 2 commits intomasterfrom
andreabedini-patch-1
Aug 31, 2025
Merged

Fix mistake in BuildInfo.Lens.hs#10609
mergify[bot] merged 2 commits intomasterfrom
andreabedini-patch-1

Conversation

@andreabedini
Copy link
Copy Markdown
Collaborator

  cxxSources f s = fmap (\x -> s{T.cSources = x}) (f (T.cxxSources s))

should be

  cxxSources f s = fmap (\x -> s{T.cxxSources = x}) (f (T.cxxSources s))

Copy link
Copy Markdown
Collaborator

@ffaf1 ffaf1 left a comment

Choose a reason for hiding this comment

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

Template missing.

commit: fc3dc42
How is it possible that this was never spotted in almost eight years? Does nobody use lenses? Do we need to add some tests?

@andreabedini
Copy link
Copy Markdown
Collaborator Author

Template missing.

Guilty as charged. For a change this obvious and small, the mental effort required to process the template was higher than the one required to fix the bug. I mean no disrespect though.

@andreabedini andreabedini added the merge me Tell Mergify Bot to merge label Dec 2, 2024
@ffaf1
Copy link
Copy Markdown
Collaborator

ffaf1 commented Dec 2, 2024

No worries. This needs a changelog, does it not?

Copy link
Copy Markdown
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.

Yes, this does not look like an obvious exception from the changelog rule. But well spotted!

@Mikolaj
Copy link
Copy Markdown
Member

Mikolaj commented Apr 10, 2025

@andreabedini: a humble ping?

@Mikolaj Mikolaj removed the merge me Tell Mergify Bot to merge label Apr 10, 2025
@andreabedini andreabedini force-pushed the andreabedini-patch-1 branch from 579e653 to 7caadcd Compare July 1, 2025 14:08
@andreabedini andreabedini requested a review from Mikolaj July 1, 2025 14:08
Copy link
Copy Markdown
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

Good modulo draft state of the changelog, which I proposed how to fix.

@geekosaur
Copy link
Copy Markdown
Collaborator

Should we fast-track this just to get us to the 3.16 finish line faster?

@ulysses4ever
Copy link
Copy Markdown
Collaborator

yes

@zlonast
Copy link
Copy Markdown
Collaborator

zlonast commented Aug 29, 2025

@andreabedini I think it's time to rebase and add the merge me label :)

@geekosaur
Copy link
Copy Markdown
Collaborator

geekosaur commented Aug 29, 2025

Also it occurs to me that nobody noticed (cf. #10609 (review)) because of #7072 and in general considerable confusion about cc-options vs. cxx-options that have only relatively recently been fixed, which would have masked it.

@geekosaur
Copy link
Copy Markdown
Collaborator

@Mikolaj, can you re-review or at least dismiss your changes-requested now that the changelog entry has been added?

Copy link
Copy Markdown
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!

@zlonast zlonast added this to the Considered for 3.18 milestone Aug 30, 2025
@zlonast
Copy link
Copy Markdown
Collaborator

zlonast commented Aug 31, 2025

@mergify rebase

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 31, 2025

rebase

❌ Command disallowed due to command restrictions in the Mergify configuration.

Details
  • any of:
    • sender = {{author}}
    • sender-permission >= write

andreabedini and others added 2 commits August 31, 2025 14:07
```
  cxxSources f s = fmap (\x -> s{T.cSources = x}) (f (T.cxxSources s))
```
should be
```
  cxxSources f s = fmap (\x -> s{T.cxxSources = x}) (f (T.cxxSources s))
```
@geekosaur geekosaur force-pushed the andreabedini-patch-1 branch from 6577068 to ca191dd Compare August 31, 2025 18:07
@zlonast zlonast added the merge me Tell Mergify Bot to merge label Aug 31, 2025
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Aug 31, 2025
@mergify mergify bot merged commit 65599b7 into master Aug 31, 2025
130 of 131 checks passed
@mergify mergify bot deleted the andreabedini-patch-1 branch August 31, 2025 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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 priority: high 🔥

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants