Make FlagAssignment an opaque newtype
#4849
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phadej
reviewed
Oct 26, 2017
| @@ -26,6 +26,9 @@ module Distribution.Client.BuildReports.Anonymous ( | |||
| -- showList, | |||
| ) where | |||
|
|
|||
| import Prelude (mapM) | |||
| @@ -15,6 +15,9 @@ module Distribution.Client.GenBounds ( | |||
| genBounds | |||
| ) where | |||
|
|
|||
| import Prelude (mapM_) | |||
| @@ -267,7 +265,7 @@ sortedFieldDescrs = sortBy (comparing fieldName) fieldDescrs | |||
|
|
|||
| dispFlag :: (FlagName, Bool) -> Disp.Doc | |||
| dispFlag (fname, True) = Disp.text (unFlagName fname) | |||
| dispFlag (fname, False) = Disp.char '-' <> Disp.text (unFlagName fname) | |||
| dispFlag (fname, False) = Disp.char '-' PP.<> Disp.text (unFlagName fname) | |||
There was a problem hiding this comment.
we have <<>>, but I don't insist.
| @@ -922,10 +922,10 @@ configureFinalizedPackage verbosity cfg enabled | |||
| -- we do it here so that those get checked too | |||
| let pkg_descr = addExtraIncludeLibDirs pkg_descr0' | |||
|
|
|||
| when (not (null flags)) $ | |||
| when (flags /= mempty) $ | |||
There was a problem hiding this comment.
should we have nullFlagAssignment?
| @@ -898,7 +898,7 @@ configuredPackageProblems :: Platform -> CompilerInfo | |||
| -> SolverPackage UnresolvedPkgLoc -> [PackageProblem] | |||
| configuredPackageProblems platform cinfo | |||
| (SolverPackage pkg specifiedFlags stanzas specifiedDeps' _specifiedExeDeps') = | |||
| [ DuplicateFlag flag | ((flag,_):_) <- duplicates specifiedFlags ] | |||
| [ DuplicateFlag flag | ((flag,_):_) <- duplicates (PD.unFlagAssignment specifiedFlags) ] -- FIXME/TODO | |||
There was a problem hiding this comment.
could you comment a little more context to TODO
| @@ -419,7 +418,7 @@ planPackages verbosity comp platform mSandboxPkgInfo solver | |||
| (PackagePropertyFlags flags) | |||
| in LabeledPackageConstraint pc ConstraintSourceConfigFlagOrTarget | |||
| | let flags = configConfigurationsFlags configFlags | |||
| , not (null flags) | |||
| , flags /= mempty | |||
|
fwiw, turning |
phadej
approved these changes
Oct 27, 2017
This is a refactoring abstracting `FlagAssignment` while retaining its external appearance as much as possible (i.e. same Read/Show/Binary instances etc). Later we can attach new instances, enforce internal invariants (like e.g. uniqueness of flagnames), switch out the internal representation (maybe to `Data.Map`), etc more easily.
hvr
force-pushed
the
pr/opaque-flagass
branch
from
df78926 to
6cb6a51
Compare
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a refactoring abstracting
FlagAssignmentwhile retaining itsexternal appearance as much as possible (i.e. same Read/Show/Binary
instances etc).
Later we can attach new instances, enforce internal invariants (like
e.g. uniqueness of flagnames), switch out the internal
representation (maybe to
Data.Map), etc more easily.Please include the following checklist in your PR:
Please also shortly describe how you tested your change. Bonus points for added tests!