Cleanup isInDir and isDirOrInDir#12667
Merged
Ericson2314 merged 3 commits intomasterfrom Mar 19, 2025
Merged
Conversation
crertel
approved these changes
Mar 17, 2025
Mic92
reviewed
Mar 19, 2025
Mic92
reviewed
Mar 19, 2025
Mic92
reviewed
Mar 19, 2025
edolstra
reviewed
Mar 19, 2025
| { | ||
| auto p1 = isInDir("/zes/foo/bar", ""); | ||
| ASSERT_EQ(p1, true); | ||
| ASSERT_EQ(p1, false); |
Member
There was a problem hiding this comment.
Perhaps this should throw an exception, but returning false also seems safe.
| TEST(isDirOrInDir, relativePathsTwice) | ||
| { | ||
| ASSERT_EQ(isDirOrInDir("/foo/..", "/foo/."), true); | ||
| ASSERT_EQ(isDirOrInDir("/foo/..", "/foo/."), false); |
Member
There was a problem hiding this comment.
Idem, perhaps relative paths should throw an exception. I think there is an implicit assumption that isDirOrInDir() is called on absolute/canonicalized paths.
The behavior *does* change, per the tests, but I think the new behavior is less buggy.
Because of the previous commit, we need to use `std::filesystem::path` anyways.
Ericson2314
force-pushed
the
in-dir-cleanup
branch
from
25ef98a to
91e90aa
Compare
edolstra
approved these changes
Mar 19, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
See each commit for details.
Context
#9205
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.