Skip to content

Move ConstraintSource and ResolverPackage to Distribution.Solver.* #3383

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

Merged
merged 3 commits into from
Apr 28, 2016

Conversation

BardurArantsson
Copy link
Collaborator

As a follow-up to #3381 these commits move ConstraintSource and ResolverPackage too.

Incidentally, ResolverPackage is a bit anemic as a module, but I've decided to stick with the general pattern of Distribution.Solver.Types.* for now. I think it'll be easier to see if there's anything that should perhaps be re-combined later on.

@BardurArantsson
Copy link
Collaborator Author

/cc @kosmikus @23Skidoo @grayjay @ezyang @dcoutts @grayjay @hvr @edsko

... just in case anyone's working on solver-relevant things and needs to know.

@BardurArantsson
Copy link
Collaborator Author

BardurArantsson commented Apr 27, 2016

This leaves the following data types:

  • DependencyResolver
  • InstalledPreference
  • LabeledPackageConstraint
  • PackageConstraint
  • PackagePreferences

which are required by the (modular) solver. Once the rest are moved, I'll start to investigate what's needed for the tests and perhaps see if TopDown can be moved sensibly (my hunch is still 'no').

The remaining imports are:

$ grep -r Distribution.Client Distribution/Solver
Distribution/Solver/Modular.hs:import Distribution.Client.Dependency.Types
Distribution/Solver/Modular/Solver.hs:import Distribution.Client.Dependency.Types
Distribution/Solver/Modular/Preference.hs:import Distribution.Client.Dependency.Types

So all Solver -> Distribution.Client.Types dependencies have at least been eliminated.

(Just FYI: I probably won't start up on this again for at least a few days.)

@BardurArantsson
Copy link
Collaborator Author

Ah, yes, CI failed because Hackage is currently down.

@BardurArantsson
Copy link
Collaborator Author

Going to redo the close->open dance since Hackage should be up now...

@kosmikus
Copy link
Contributor

LGTM.

@kosmikus
Copy link
Contributor

@23Skidoo Feel free to merge if you also don't see any problems.

@23Skidoo 23Skidoo merged commit a20290c into haskell:master Apr 28, 2016
@23Skidoo
Copy link
Member

Merged, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants