src: revert filesystem::path changes #55015
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
|
Review requested:
|
nodejs-github-bot
added
c++
anonrig
force-pushed
the
revert-filesystem-path
branch
3 times, most recently
from
eea22f7 to
37bd2dc
Compare
benjamingr
approved these changes
Sep 19, 2024
anonrig
force-pushed
the
revert-filesystem-path
branch
2 times, most recently
from
be2b0b8 to
b0e83d9
Compare
|
@joyeecheung Can you double check the changes on compile_cache.cc and header file? I manually had to change those lines, there was a conflict. |
anonrig
commented
Sep 19, 2024
| auto file_status = std::filesystem::status(path); | ||
| if (file_status.type() == std::filesystem::file_type::directory) { | ||
| path /= "*"; | ||
| uv_fs_t req; |
There was a problem hiding this comment.
@joyeecheung Is it safe to keep this function, or do we need this revert?
There was a problem hiding this comment.
Is std::filesystem::path(res) correct? From what I can tell, res contains UTF8-encoded data, and it's about to be passed into uv_fs_stat which also expects UTF8-encoded data. So std::filesystem::path(res) here is also going to crash on Windows when res contains code points that are encoded differently in UTF16 unless it's casted between u8string both ways.
anonrig
force-pushed
the
revert-filesystem-path
branch
from
b0e83d9 to
67ddaa9
Compare
avivkeller
added
fs
|
Is it possible to add a test for those issues? |
anonrig
force-pushed
the
revert-filesystem-path
branch
from
67ddaa9 to
ba26f0b
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #55015 +/- ##
=======================================
Coverage 88.04% 88.04%
=======================================
Files 652 652
Lines 183764 183760 -4
Branches 35862 35863 +1
=======================================
Hits 161787 161787
+ Misses 15233 15230 -3
+ Partials 6744 6743 -1
|
joyeecheung
approved these changes
Sep 20, 2024
| std::u8string cache_dir_with_tag_u8 = cache_dir_with_tag.u8string(); | ||
| std::string cache_dir_with_tag_str(cache_dir_with_tag_u8.begin(), | ||
| cache_dir_with_tag_u8.end()); | ||
| std::string cache_dir_with_tag = |
There was a problem hiding this comment.
You can minimize the diff/potential conflicts if this is named as cache_dir_with_tag_str
anonrig
added
the
commit-queue
nodejs-github-bot
removed
the
commit-queue
|
Landed in 5a96671 |
targos
pushed a commit
that referenced
this pull request
Oct 4, 2024
PR-URL: #55015 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Merged
louwers
pushed a commit
to louwers/node
that referenced
this pull request
Nov 2, 2024
PR-URL: nodejs#55015 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
marco-ippolito
added
the
dont-land-on-v20.x
tpoisseau
pushed a commit
to tpoisseau/node
that referenced
this pull request
Nov 21, 2024
PR-URL: nodejs#55015 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
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.
Reverts #53063. There are still some
filesystem::pathreferences left, since they're added in multiple different PRs. Depending on whether we need them or not, we can remove them.We're reverting because it fixes multiple different regressions due to Windows UTF-16 path requirements.
Fixes #54991
Fixes #54476