cp: move copy_directory() to its own module#3901
Merged
sylvestre merged 3 commits intouutils:mainfrom Oct 20, 2022
Merged
Conversation
jfinkels
force-pushed
the
cp-refactor-copy-direntry
branch
from
207f28b to
f41ef8c
Compare
sylvestre
force-pushed
the
cp-refactor-copy-direntry
branch
2 times, most recently
from
6de0201 to
88201db
Compare
jfinkels
force-pushed
the
cp-refactor-copy-direntry
branch
from
88201db to
a78755f
Compare
Collaborator
|
Looks good! I just have the one comment above but otherwise ready to merge. Could you separate the moving around and refactoring next time, so it's easier to review? |
Collaborator
Author
Yes, absolutely. |
jfinkels
force-pushed
the
cp-refactor-copy-direntry
branch
from
d2543cd to
efda4f1
Compare
Collaborator
Author
|
I rebased and updated this branch so that one commit moves the |
jfinkels
force-pushed
the
cp-refactor-copy-direntry
branch
2 times, most recently
from
4a02434 to
7b5c857
Compare
Contributor
|
Conflicts too :/ |
jfinkels
force-pushed
the
cp-refactor-copy-direntry
branch
from
7b5c857 to
87b2b33
Compare
Contributor
|
Conflicting again after the merge of your other PR ;) |
jfinkels
force-pushed
the
cp-refactor-copy-direntry
branch
2 times, most recently
from
940ce05 to
f5c8dcc
Compare
sylvestre
force-pushed
the
cp-refactor-copy-direntry
branch
from
f5c8dcc to
abcc123
Compare
Refactor common code into a helper method `Options::preserve_hard_links()`. This also eliminates the need for mutability in a local variable in two places.
Move the `copy_directory()` helper function to a new module `copydir.rs`. This commit only changes the organization of the code, not its behavior.
Add some additional structs and helper functions to make the code in `copydir.rs` easier to read and maintain. This commit changes only the organization of the code, not its function.
jfinkels
force-pushed
the
cp-refactor-copy-direntry
branch
from
abcc123 to
aeba601
Compare
|
GNU testsuite comparison: |
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
3 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.
This pull request refactors
copy_directory()and related helper functions into its own new modulecopydir.rs. This commit also adds some additional structs and helper functions to make the code easier to read and maintain. This commit does not change the behavior of thecopy_directory()function, only the organization of the code.I am proposing this change because I felt while working on pull request #3894 that it was harder than necessary for me to read and understand the code.