Support getting file metadata on Windows #4067

CraftSpider · 2024-12-02T03:38:08Z

Main changes are the first two commits - one refactors handles a bit to make their usage more consistent and adds the file variant, the other actually adds the metadata shims.

This also changes miri to never return invalid handle errors, instead always treating them as an error. This behavior matches that of code running under the MSVC debugger - invalid handles are treated as exceptions in debug contexts.

Split off #4043

tests/pass/shims/fs.rs

RalfJung

Thanks! Here are some comments for the first and last commit, I skipped the second one for now.

src/shims/windows/handle.rs

tests/pass/shims/fs.rs

src/shims/windows/fs.rs

src/shims/windows/handle.rs

CraftSpider · 2024-12-06T04:47:22Z

Before we get too much further on this PR, I'd like to point out 296d806 (which I just pushed) on the big PR. It's the changes needed to FileDescription methods to make them platform-agnostic enough for Windows use-cases. If they look fine, we can continue, but if you think it's a bad design then the FileDescription trait will need entirely split in two, which will change code even in this PR.

RalfJung · 2024-12-06T06:57:58Z

Reducing the places where we have to use global state like errno seems like an improvement. But please use Result<_, IoError> (with Miri's IoError type).

CraftSpider · 2024-12-06T21:04:24Z

@rustbot ready

tests/pass/shims/windows-fs.rs

src/shims/windows/handle.rs

src/shims/windows/fs.rs

RalfJung · 2024-12-07T08:02:06Z

src/shims/windows/fs.rs

+    const TIME_TO_EPOCH: u64 = 31_556_926 * 369 * 10_000_000;
+    match time.ok() {
+        Some(time) => {
+            let duration = system_time_to_duration(&time)?;


We should probably rename this to system_time_since_unix_epoch. (Can be a future PR though.)

RalfJung · 2024-12-07T08:02:42Z

Okay I finally had a look at the core new file in this PR. :)
@rustbot author

tests/pass/shims/windows-fs.rs

src/shims/windows/fs.rs

CraftSpider · 2024-12-09T21:59:23Z

@rustbot ready

bors · 2024-12-12T08:08:12Z

☔ The latest upstream changes (presumably #4068) made this pull request unmergeable. Please resolve the merge conflicts.

src/shims/windows/fs.rs

src/shims/files.rs

src/shims/windows/fs.rs

src/shims/windows/handle.rs

RalfJung · 2024-12-12T16:58:36Z

@rustbot author

src/shims/windows/fs.rs

CraftSpider · 2025-02-24T21:56:02Z

Thanks, sorry for the unnecessary ping then.

RalfJung

Thanks for the patience!

src/shims/unix/fd.rs

src/shims/windows/handle.rs

src/shims/windows/fs.rs

tests/pass/shims/fs.rs

src/shims/windows/fs.rs

tests/pass-dep/shims/windows-fs.rs

src/shims/windows/fs.rs

src/shims/windows/handle.rs

RalfJung · 2025-03-20T17:05:29Z

@rustbot author

CraftSpider · 2025-04-02T02:03:40Z

@rustbot review

- consistent handling, invalid handles are always an abort - Helper for reading handles that does the checking and machine stop - Use real handle types more places - Adds `File` and `Invalid` types of handle. File support will be added next

RalfJung

Thanks a lot! I'm happy with the general approach and structure now, we're just finalizing comments and style. :)

@rustbot author

Cargo.toml

src/shims/windows/fs.rs

tests/pass/shims/fs.rs

rustbot · 2025-04-07T15:37:35Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

CraftSpider · 2025-04-07T22:52:34Z

Thanks for the patience and help with getting this over the line! After this merges, I'll work to flesh out the shims more, make it so you can actually do useful things with files targeting Windows.

@rustbot ready

RalfJung · 2025-04-08T06:15:30Z

Thank you for your patience with the sometimes slow round-trip times. :)

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

… enough to get file metadata.

CraftSpider · 2025-04-09T04:13:38Z

@rustbot review

CraftSpider mentioned this pull request Dec 2, 2024

Windows file system shims are missing #3482

Open

RalfJung reviewed Dec 2, 2024

View reviewed changes

tests/pass/shims/fs.rs Show resolved Hide resolved

RalfJung reviewed Dec 3, 2024

View reviewed changes

RalfJung reviewed Dec 5, 2024

View reviewed changes

src/shims/windows/handle.rs Outdated Show resolved Hide resolved

rustbot added the S-waiting-on-review Status: Waiting for a review to complete label Dec 6, 2024

RalfJung reviewed Dec 7, 2024

View reviewed changes

tests/pass/shims/windows-fs.rs Outdated Show resolved Hide resolved

RalfJung reviewed Dec 7, 2024

View reviewed changes

rustbot added S-waiting-on-author Status: Waiting for the PR author to address review comments and removed S-waiting-on-review Status: Waiting for a review to complete labels Dec 7, 2024

RalfJung reviewed Dec 7, 2024

View reviewed changes

tests/pass/shims/windows-fs.rs Outdated Show resolved Hide resolved

RalfJung reviewed Dec 8, 2024

View reviewed changes

src/shims/windows/fs.rs Outdated Show resolved Hide resolved

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 Dec 9, 2024