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.

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

Set st_fstype of stat on Solaris and Illumos OSes #4159

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

YohDeadfall
Copy link
Contributor

Since rust-lang/libc#4145 is merged that FIXME is unblocked. I also decided to rename the method as it applies to Illumos too, so solarish seems more natural there.

@YohDeadfall YohDeadfall changed the title Set st_fstype of stat on Solaris and Illumos OSes" Set st_fstype of stat on Solaris and Illumos OSes Jan 28, 2025
src/shims/unix/fs.rs Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member

This will require the libc version in rust'c library/Cargo.lock to be updated (and probably also in Miri's test_dependencies/Cargo.lock).

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jan 28, 2025
@RalfJung
Copy link
Member

RalfJung commented Jan 28, 2025

Actually never mind, the error is different than what I expected:

write_int on non-scalar type [i8; 16]

And indeed, looking at libc this is an array. You'll probably want to project to its first element and write 0 there; for a 0-terminated string, that should suffice.

@RalfJung RalfJung added S-waiting-on-author Status: Waiting for the PR author to address review comments and removed S-blocked-on-rust Status: Blocked on landing a Rust PR labels Jan 28, 2025
@RalfJung
Copy link
Member

This looks great, thanks! Please squash the commits, then we can land this. Please use the --keep-base flag when squashing so that the force-push diff is easier to review. Then write @rustbot ready after you pushed the squashed PR.

@rustbot author

@YohDeadfall YohDeadfall force-pushed the write-st-fstype-on-solaris branch from 2c5c6d7 to 5b501a4 Compare January 29, 2025 22:26
@YohDeadfall
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Waiting for a review to complete and removed S-waiting-on-author Status: Waiting for the PR author to address review comments labels Jan 29, 2025
@RalfJung RalfJung enabled auto-merge January 29, 2025 22:51
@RalfJung RalfJung added this pull request to the merge queue Jan 29, 2025
Merged via the queue into rust-lang:master with commit 099f494 Jan 29, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Waiting for a review to complete
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants