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

ordNub for extra stanzas #8499

Merged
merged 5 commits into from Oct 24, 2022
Merged

ordNub for extra stanzas #8499

merged 5 commits into from Oct 24, 2022

Conversation

gbaz
Copy link
Collaborator

@gbaz gbaz commented Sep 29, 2022

Resolves #8458

Also moves the other uses of set-based nubbing in that file to ordNub, which should hopefully be a strict improvement.


-- | Add extra source dir for generated modules.
addSrcDir :: BuildInfo -> FilePath -> BuildInfo
addSrcDir bi extra = bi { hsSourceDirs = new }
where new = Set.toList $ old `Set.union` ex
old = Set.fromList $ hsSourceDirs bi
ex = Set.fromList [unsafeMakeSymbolicPath extra] -- TODO
Copy link
Collaborator

Choose a reason for hiding this comment

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

What happened to the TODO?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

got lost, but I'm not sure what it meant to begin with?

Copy link
Collaborator

Choose a reason for hiding this comment

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

yeah, neither do I, unfortunately. I hoped you fixed it somehow :D

Copy link
Collaborator

Choose a reason for hiding this comment

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

What it meant I have a guess: maybe the author of TODO wished there was no "unsafe"?

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.

LGTM. Given how long it stayed there, let's not worry too much about unsafeMakeSymbolicPath.

@Mikolaj
Copy link
Member

Mikolaj commented Oct 20, 2022

@gbaz: let's merge?

@gbaz gbaz added the squash+merge me Tell Mergify Bot to squash-merge label Oct 21, 2022
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Oct 23, 2022
@mergify mergify bot merged commit 6cf9e13 into master Oct 24, 2022
alexbiehl pushed a commit to alexbiehl/cabal that referenced this pull request Dec 15, 2022
* ordNub for extra stanzas

* changelong

* Update pr-8499

Co-authored-by: Gershom Bazerman <gershom@arista.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
attention: needs-review 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
Development

Successfully merging this pull request may close these issues.

cabal-install 3.8.1.0 regression: can't control the order of hs-source-dirs anymore
4 participants