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.

Sign up for GitHub

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

Jump to bottom

join: remove crash! macro #5540

Merged
merged 4 commits into from
Nov 17, 2023
Merged

join: remove crash! macro #5540

merged 4 commits into from
Nov 17, 2023

Conversation

cswn
Copy link
Contributor

@cswn cswn commented Nov 15, 2023

This is related to issue #5487. Removes the crash! macro from join.

@github-actions GitHub Actions
Copy link

GNU testsuite comparison:

GNU test failed: tests/tail/symlink. tests/tail/symlink is passing on 'main'. Maybe you have to rebase?

@github-actions GitHub Actions
Copy link

GNU testsuite comparison:

GNU test failed: tests/tail/inotify-dir-recreate. tests/tail/inotify-dir-recreate is passing on 'main'. Maybe you have to rebase?

tertsdiepraam
tertsdiepraam reviewed Nov 15, 2023
View reviewed changes
Copy link
Member

@tertsdiepraam tertsdiepraam left a comment

Choose a reason for hiding this comment

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

Nice! I think you're on the right track and the solution is correct, but I do have a suggestion to make it a bit more like the other utils (and not having to use the UnorderedInput variant).

@cswn cswn requested a review from tertsdiepraam November 16, 2023 08:37
@github-actions GitHub Actions
Copy link

GNU testsuite comparison:

GNU test failed: tests/tail/inotify-dir-recreate. tests/tail/inotify-dir-recreate is passing on 'main'. Maybe you have to rebase?
GNU test failed: tests/tail/truncate. tests/tail/truncate is passing on 'main'. Maybe you have to rebase?

tertsdiepraam
tertsdiepraam reviewed Nov 16, 2023
View reviewed changes
Copy link
Member

@tertsdiepraam tertsdiepraam left a comment

Choose a reason for hiding this comment

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

Excellent work! This is exactly what I had in mind. Because we now use UResult I think we can also remove this bit:

https://github.com/uutils/coreutils/blob/a064c886566f810c3e58b1b1153762e772e35567/src/uu/join/src/join.rs#L704-L707C6

and just make that a call to exec and return the result. And then we can merge this.

@cswn
Copy link
Contributor Author

cswn commented Nov 16, 2023

Awesome, thanks 😄 Let me know if this is what you had in mind.

tertsdiepraam
tertsdiepraam approved these changes Nov 16, 2023
View reviewed changes
Copy link
Member

@tertsdiepraam tertsdiepraam left a comment

Choose a reason for hiding this comment

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

Yes, that's it! I'll wait for the CI but seems ready to be merged. Thanks!

@cakebaker cakebaker merged commit a7e5af4 into uutils:main Nov 17, 2023
@cakebaker
Copy link
Contributor

Thanks!

@cswn cswn deleted the join-remove-crash-macro branch November 17, 2023 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tertsdiepraam tertsdiepraam tertsdiepraam approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cswn @cakebaker @tertsdiepraam