Skip to content

support readdir on FreeBSD #4589

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
Merged
merged 1 commit into from
Sep 17, 2025
Merged

support readdir on FreeBSD #4589

merged 1 commit into from
Sep 17, 2025
+46 −27

Conversation

@LorrensP-2158466
Copy link
Contributor

@LorrensP-2158466 LorrensP-2158466 commented Sep 16, 2025 •
edited
Loading

Fixes #4587.

Modifies the previously named linux_solarish_readdir64 (now readdir64) to also work on freebsd.

@rustbot
Copy link
Collaborator

rustbot commented Sep 16, 2025

Thank you for contributing to Miri!
Please remember to not force-push to the PR branch except when you need to rebase due to a conflict or when the reviewer asks you for it.

@rustbot rustbot added the S-waiting-on-review Status: Waiting for a review to complete label Sep 16, 2025
RalfJung
RalfJung reviewed Sep 17, 2025
View reviewed changes
Copy link
Member

@RalfJung RalfJung left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

Thanks!

Could you please also rebase and remove the freebsd exception in tests/pass/shims/fs.rs so that this gets tested again?

View changes since this review

src/shims/unix/fs.rs Outdated
if !matches!(&*this.tcx.sess.target.os, "linux" | "solaris" | "illumos") {
if !matches!(
&*this.tcx.sess.target.os,
"linux" | "solaris" | "illumos" | "macos" | "freebsd"
Copy link
Member

Choose a reason for hiding this comment

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

Why "macos"? I don't think std uses this on macos. That means we have no tests, and we shouldn't add this without tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The docs for macos and freebsd are the same for this operation, so I thought to also support it for macos. I'll remove it!

@RalfJung
Copy link
Member

I have also pushed a commit to further simplify that entry / entry_place business; please make sure to pull that.

@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@LorrensP-2158466 LorrensP-2158466 changed the title support readdir on FreeBSD and MacOS support readdir on FreeBSD Sep 17, 2025
@RalfJung RalfJung enabled auto-merge September 17, 2025 19:44
@RalfJung
Copy link
Member

Thanks :)

@RalfJung RalfJung added this pull request to the merge queue Sep 17, 2025
Merged via the queue into rust-lang:master with commit 2958f06 Sep 17, 2025
12 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Waiting for a review to complete label Sep 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung 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.

read_dir broken on FreeBSD

3 participants

@LorrensP-2158466 @rustbot @RalfJung