Skip to content

yes: use splice_data functions from uucore#6980

Closed
DaringCuteSeal wants to merge 2 commits intouutils:mainfrom
DaringCuteSeal:yes-splice
Closed

yes: use splice_data functions from uucore#6980
DaringCuteSeal wants to merge 2 commits intouutils:mainfrom
DaringCuteSeal:yes-splice

Conversation

@DaringCuteSeal
Copy link
Copy Markdown
Contributor

@DaringCuteSeal DaringCuteSeal commented Dec 19, 2024 •
edited
Loading

Have yes use the splice-write utilities from uucore. Follow-up of #6964.

@DaringCuteSeal DaringCuteSeal marked this pull request as draft December 19, 2024 15:12
sylvestre
sylvestre reviewed Dec 19, 2024
View reviewed changes
src/uucore/src/lib/features/buf_copy.rs Outdated
use crate::error::{UError, UResult};
use nix::unistd;

use std::fs::File;
Copy link
Copy Markdown
Contributor

@sylvestre sylvestre Dec 19, 2024

Choose a reason for hiding this comment

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

Suggested change
use std::fs::File;

sylvestre
sylvestre reviewed Dec 19, 2024
View reviewed changes
src/uucore/src/lib/features/buf_copy.rs Outdated
#[cfg(unix)]
use nix::unistd;
#[cfg(unix)]
use nix::{errno::Errno, libc::S_IFIFO, sys::stat::fstat};
Copy link
Copy Markdown
Contributor

@sylvestre sylvestre Dec 19, 2024

Choose a reason for hiding this comment

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

Suggested change
use nix::{errno::Errno, libc::S_IFIFO, sys::stat::fstat};
use nix::{libc::S_IFIFO, sys::stat::fstat};

@DaringCuteSeal
Copy link
Copy Markdown
Contributor Author

DaringCuteSeal commented Dec 19, 2024

eh, i figured out some missing compile guards on the buf-copy. lemme resolve em first and make a new PR

@github-actions
Copy link
Copy Markdown

github-actions bot commented Dec 19, 2024

GNU testsuite comparison:

GNU test failed: tests/misc/yes. tests/misc/yes is passing on 'main'. Maybe you have to rebase?
Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

@github-actions
Copy link
Copy Markdown

github-actions bot commented Dec 20, 2024

GNU testsuite comparison:

GNU test failed: tests/misc/yes. tests/misc/yes is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

@DaringCuteSeal DaringCuteSeal marked this pull request as ready for review December 29, 2024 03:30
@github-actions
Copy link
Copy Markdown

github-actions bot commented Dec 29, 2024

GNU testsuite comparison:

GNU test failed: tests/misc/yes. tests/misc/yes is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

@cakebaker
Copy link
Copy Markdown
Contributor

cakebaker commented Dec 30, 2024

Did you see that some jobs in the CI fail?

@DaringCuteSeal
Copy link
Copy Markdown
Contributor Author

DaringCuteSeal commented Dec 30, 2024

Did you see that some jobs in the CI fail?

oh, hmm i didn't see those. sorry, i'll try to fix em a bit later

@DaringCuteSeal DaringCuteSeal marked this pull request as draft January 2, 2025 06:04
@github-actions
Copy link
Copy Markdown

github-actions bot commented Jan 2, 2025

GNU testsuite comparison:

GNU test failed: tests/misc/yes. tests/misc/yes is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

@DaringCuteSeal
Copy link
Copy Markdown
Contributor Author

DaringCuteSeal commented Jan 2, 2025 •
edited
Loading

Hi, ran into a problem here. >,<

I found out that yes actually needs to know the kind of error that the write function encountered, and if it is returning from a broken pipe, yes will return without any error which I think makes sense. I suspect this is why the tests on Windows are problematic.

The problem is that, yes cannot know the kind of error it gets as the functions it uses (from the buf-copy module I made for a refactor in #6964) because the functions all return a UResult (just a trait).

I'm actually considering deleting altogether the code I separated from yes in uucore, as I think the use case for those functions is pretty specific to yes anyways.

So, what do the devs here think? There are two choices I see:

  • Make several functions from buf-copy return std::io::Error. Not too elegant imo
  • Do not modify yes as its use of buffer-copying is too specific to be split into a module. Delete the functions I split from uucore/buf-copy.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Jan 2, 2025

GNU testsuite comparison:

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

@sylvestre
Copy link
Copy Markdown
Contributor

sylvestre commented Jan 2, 2025

Do not modify yes as its use of buffer-copying is too specific to be split into a module. Delete the functions I split from uucore/buf-copy.

Let's do that, it is fine :)

@DaringCuteSeal DaringCuteSeal mentioned this pull request Jan 3, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sylvestre sylvestre sylvestre left review comments

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

@DaringCuteSeal @cakebaker @sylvestre