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

Separate path.hh from content-address.hh #7716

Merged
merged 1 commit into from
Feb 1, 2023

Conversation

Ericson2314
Copy link
Member

Motivation

It is good to separate concerns; StorePath (in general) has nothing to do with ContentAddress anyways.

Context

This reduces the diff from #3746.

Checklist for maintainers

Maintainers: tick if completed or explain if not relevant

  • agreed on idea
  • agreed on implementation strategy
  • tests, as appropriate
    • functional tests - tests/**.sh
    • unit tests - src/*/tests
    • integration tests - tests/nixos/*
  • documentation in the manual
  • code and comments are self-explanatory
  • commit message explains why the change was made
  • new feature or bug fix: updated release notes

It is good to separate concerns; `StorePath` (in general) has nothing to
do with `ContentAddress` anyways.

This reduces the diff from NixOS#3746.
@@ -66,8 +67,6 @@ public:
typedef std::set<StorePath> StorePathSet;
typedef std::vector<StorePath> StorePaths;

typedef std::map<StorePath, std::optional<ContentAddress>> StorePathCAMap;
Copy link
Member Author

Choose a reason for hiding this comment

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

Not used in this header

@thufschmitt thufschmitt merged commit 518da6c into NixOS:master Feb 1, 2023
@Ericson2314 Ericson2314 deleted the small-storePath-cleanups branch February 1, 2023 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants