std: sys: fs: uefi: Make time in FileAttr optional#149538
Merged
bors merged 1 commit intorust-lang:mainfrom Dec 3, 2025
Merged
std: sys: fs: uefi: Make time in FileAttr optional#149538bors merged 1 commit intorust-lang:mainfrom
bors merged 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
rustbot has assigned @Mark-Simulacrum. Use |
Contributor
Author
|
@joboet Can you take a look at this since it kinda follows https://github.com/rust-lang/rust/pull/13891833 |
joboet
approved these changes
Dec 2, 2025
Ayush1325
force-pushed
the
uefi-fs-time-fix
branch
from
e862f1a to
bd7f68d
Compare
Contributor
Author
Fixed |
joboet
reviewed
Dec 2, 2025
library/std/src/sys/fs/uefi.rs
Outdated
| pub(crate) fn uefi_to_systemtime(mut time: r_efi::efi::Time) -> SystemTime { | ||
| pub(crate) fn uefi_to_systemtime(mut time: r_efi::efi::Time) -> Option<SystemTime> { | ||
| time.timezone = if time.timezone == r_efi::efi::UNSPECIFIED_TIMEZONE { | ||
| time::system_time_internal::now().unwrap().timezone |
Member
There was a problem hiding this comment.
I'd add a panic message here (and in systemtime_to_uefi) as well, like in SystemTime::now. Or maybe make system_time_internal::now() panic directly.
Contributor
Author
There was a problem hiding this comment.
Since all users of system_time_internal::now() were calling unwrap on it, I have made the function itself panic.
At least on OVMF, some files copied over from linux file system seem to have invalid time (year = 1980 and everything else 0). Since Rust allows time to be optional and we can return error, that seems to be the way to go for now. Signed-off-by: Ayush Singh <ayush@beagleboard.org>
Ayush1325
force-pushed
the
uefi-fs-time-fix
branch
from
bd7f68d to
1331c35
Compare
Member
|
Great, r=me once CI passes. |
Collaborator
|
✌️ @Ayush1325, you can now approve this pull request! If @joboet told you to " |
Contributor
Author
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Dec 2, 2025
Rollup of 5 pull requests Successful merges: - #146436 (Slice iter cleanup) - #148250 (array_chunks: slightly improve docs) - #148678 (Merge E0412 into E0425) - #149520 (also introduce Peekable::next_if_map_mut next to next_if_map) - #149538 (std: sys: fs: uefi: Make time in FileAttr optional) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Dec 3, 2025
Rollup merge of #149538 - Ayush1325:uefi-fs-time-fix, r=joboet std: sys: fs: uefi: Make time in FileAttr optional At least on OVMF, some files copied over from linux file system seem to have invalid time (year = 1980 and everything else 0). Since Rust allows time to be optional, and we can return error, that seems to be the way to go for now. `@rustbot` label +O-UEFI
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
At least on OVMF, some files copied over from linux file system seem to have invalid time (year = 1980 and everything else 0). Since Rust allows time to be optional, and we can return error, that seems to be the way to go for now.
@rustbot label +O-UEFI