uefi: use core::net-types in public API + remove duplications #1780
Conversation
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
phip1611
force-pushed
the
core-net
branch
2 times, most recently
from
358a4c9 to
c0408f3
Compare
phip1611
commented
Oct 17, 2025
| }; | ||
|
|
||
| // Translate IP types back into the higher-level types. | ||
| let fn_replace_ip = |core_ip: &mut Option<&mut IpAddr>, efi_ip: Option<EfiIpAddr>| { |
There was a problem hiding this comment.
Please note that this will be tested once #1785 is merged.
phip1611
force-pushed
the
core-net
branch
2 times, most recently
from
4634e0b to
8e03354
Compare
2 tasks
uefi/src/proto/network/pxe.rs
Outdated
| let fn_replace_ip = |core_ip: &mut Option<&mut IpAddr>, efi_ip: Option<EfiIpAddr>| { | ||
| // TODO use let-chain once we are on MSRV 1.88 | ||
| if let Some(core_ip_location) = core_ip { | ||
| if let Some(efi_ip) = efi_ip { |
There was a problem hiding this comment.
Nit: could do if let (Some(core_ip_location), Some(efi_ip)) = (core_ip, efi_ip) {. Not sure if that's particularly more or less clear than if-let-chains.
nicholasbishop
approved these changes
Oct 21, 2025
Please note that some structs that are low-level types and
UEFI-facing still use EfiIpAddr instead. This includes for
example
```rust
/// This struct contains optional parameters for [`BaseCode::discover`].
///
/// Corresponds to the `EFI_PXE_BASE_CODE_DISCOVER_INFO` type in the C API.
#[repr(C)]
#[derive(Debug, Pointee)]
pub struct DiscoverInfo {
use_m_cast: bool,
use_b_cast: bool,
use_u_cast: bool,
must_use_list: bool,
server_m_cast_ip: EfiIpAddr,
ip_cnt: u16,
srv_list: [Server],
}
```
Once #1642 is resolved,
this can be improved.
Otherwise, some users have to also pull in uefi-raw in a matching version as dependency. We however want to prevent a mix use in public API. See [0] for context. [0] https://rust-osdev.zulipchat.com/#narrow/channel/426438-uefi-rs/topic/Re-export.20.60uefi-raw.60.20from.20.60uefi.60.3F/near/545022347
|
FYI: Some types still in the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This is the final step of #1575, after many pre-requisites have been merged recently.
Closes #1575
Checklist