Get rid of CanonPath::fromCwd
#9948
Merged
Conversation
This file contains 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
github-actions
bot
added
new-cli
edolstra
reviewed
Feb 8, 2024
| @@ -29,6 +29,6 @@ private: | |||
| std::map<std::string, std::string> autoArgs; | |||
| }; | |||
|
|
|||
| SourcePath lookupFileArg(EvalState & state, std::string_view s, CanonPath baseDir = CanonPath::fromCwd()); | |||
| SourcePath lookupFileArg(EvalState & state, std::string_view s, const Path * baseDir = nullptr); | |||
There was a problem hiding this comment.
Suggested change
| SourcePath lookupFileArg(EvalState & state, std::string_view s, const Path * baseDir = nullptr); | |
| SourcePath lookupFileArg(EvalState & state, std::string_view s, std::optional<Path> baseDir = std::nullopt); |
seem cleaner, then we don't have to take addresses etc.
There was a problem hiding this comment.
I just did it that way because we didn't need a copy of a the base dir string, just a reference to it.
There was a problem hiding this comment.
Also recall that std::optional<const Path &> doesn't work because C++ is silly.
Ericson2314
commented
Feb 8, 2024
Ericson2314
force-pushed
the
no-canon-path-from-cwd
branch
3 times, most recently
from
31865c3
to
ff2315e
Compare
As discussed in the last Nix team meeting (2024-02-95), this method doesn't belong because `CanonPath` is a virtual/ideal absolute path format, not used in file systems beyond the native OS format for which a "current working directory" is defined. Progress towards NixOS#9205
Ericson2314
force-pushed
the
no-canon-path-from-cwd
branch
from
ff2315e
to
4687bee
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Motivation
As discussed in the last Nix team meeting (2024-02-95), this method doesn't belong because
CanonPathis a virtual/ideal absolute path format, not used in file systems beyond the native OS format for which a "current working directory" is defined.Context
Progress towards #9205
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.