Skip to content

Commit 048896a

Browse files
phip1611phip1611
authored
Merge pull request #1496 from rust-osdev/bishop-update-ptr-meta
Update ptr_meta to 0.3.0
2 parents 138c3c2 + 3cde136 commit 048896a

File tree

8 files changed

+42
-53
lines changed

8 files changed

+42
-53
lines changed

‎Cargo.lock

Lines changed: 16 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rust-version = "1.81"
2222
[workspace.dependencies]
2323
bitflags = "2.0.0"
2424
log = { version = "0.4.5", default-features = false }
25-
ptr_meta = { version = "0.2.0", default-features = false }
25+
ptr_meta = { version = "0.3.0", default-features = false, features = ["derive"] }
2626
uguid = "2.1.0"
2727

2828
[patch.crates-io]

‎uefi/src/proto/device_path/device_path_gen.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use bitflags::bitflags;
1818
use core::mem::{size_of, size_of_val};
1919
use core::ptr::addr_of;
2020
use core::{fmt, slice};
21-
use ptr_meta::{Pointee, PtrExt};
21+
use ptr_meta::Pointee;
2222
/// Device path nodes for [`DeviceType::END`].
2323
pub mod end {
2424
use super::*;
@@ -245,7 +245,7 @@ pub mod hardware {
245245
.field("vendor_guid", &{ self.vendor_guid })
246246
.field("vendor_defined_data", {
247247
let ptr = addr_of!(self.vendor_defined_data);
248-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
248+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
249249
let byte_len = size_of::<u8>() * len;
250250
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
251251
})
@@ -513,7 +513,7 @@ pub mod acpi {
513513
#[must_use]
514514
pub fn adr(&self) -> UnalignedSlice<u32> {
515515
let ptr: *const [u32] = addr_of!(self.adr);
516-
let (ptr, len): (*const (), usize) = PtrExt::to_raw_parts(ptr);
516+
let (ptr, len): (*const (), usize) = ptr_meta::to_raw_parts(ptr);
517517
unsafe { UnalignedSlice::new(ptr.cast::<u32>(), len) }
518518
}
519519
}
@@ -523,7 +523,7 @@ pub mod acpi {
523523
f.debug_struct("Adr")
524524
.field("adr", {
525525
let ptr = addr_of!(self.adr);
526-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
526+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
527527
let byte_len = size_of::<u32>() * len;
528528
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
529529
})
@@ -1064,7 +1064,7 @@ pub mod messaging {
10641064
#[must_use]
10651065
pub fn serial_number(&self) -> UnalignedSlice<u16> {
10661066
let ptr: *const [u16] = addr_of!(self.serial_number);
1067-
let (ptr, len): (*const (), usize) = PtrExt::to_raw_parts(ptr);
1067+
let (ptr, len): (*const (), usize) = ptr_meta::to_raw_parts(ptr);
10681068
unsafe { UnalignedSlice::new(ptr.cast::<u16>(), len) }
10691069
}
10701070
}
@@ -1077,7 +1077,7 @@ pub mod messaging {
10771077
.field("device_product_id", &{ self.device_product_id })
10781078
.field("serial_number", {
10791079
let ptr = addr_of!(self.serial_number);
1080-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
1080+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
10811081
let byte_len = size_of::<u16>() * len;
10821082
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
10831083
})
@@ -1671,7 +1671,7 @@ pub mod messaging {
16711671
.field("vendor_guid", &{ self.vendor_guid })
16721672
.field("vendor_defined_data", {
16731673
let ptr = addr_of!(self.vendor_defined_data);
1674-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
1674+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
16751675
let byte_len = size_of::<u8>() * len;
16761676
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
16771677
})
@@ -1815,7 +1815,7 @@ pub mod messaging {
18151815
.field("target_portal_group_tag", &{ self.target_portal_group_tag })
18161816
.field("iscsi_target_name", {
18171817
let ptr = addr_of!(self.iscsi_target_name);
1818-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
1818+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
18191819
let byte_len = size_of::<u8>() * len;
18201820
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
18211821
})
@@ -1910,7 +1910,7 @@ pub mod messaging {
19101910
f.debug_struct("Uri")
19111911
.field("value", {
19121912
let ptr = addr_of!(self.value);
1913-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
1913+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
19141914
let byte_len = size_of::<u8>() * len;
19151915
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
19161916
})
@@ -2188,7 +2188,7 @@ pub mod messaging {
21882188
#[must_use]
21892189
pub fn addresses(&self) -> UnalignedSlice<IpAddress> {
21902190
let ptr: *const [IpAddress] = addr_of!(self.addresses);
2191-
let (ptr, len): (*const (), usize) = PtrExt::to_raw_parts(ptr);
2191+
let (ptr, len): (*const (), usize) = ptr_meta::to_raw_parts(ptr);
21922192
unsafe { UnalignedSlice::new(ptr.cast::<IpAddress>(), len) }
21932193
}
21942194
}
@@ -2199,7 +2199,7 @@ pub mod messaging {
21992199
.field("address_type", &{ self.address_type })
22002200
.field("addresses", {
22012201
let ptr = addr_of!(self.addresses);
2202-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
2202+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
22032203
let byte_len = size_of::<IpAddress>() * len;
22042204
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
22052205
})
@@ -2292,7 +2292,7 @@ pub mod messaging {
22922292
.field("access_mode", &{ self.access_mode })
22932293
.field("vendor_guid_and_data", {
22942294
let ptr = addr_of!(self.vendor_guid_and_data);
2295-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
2295+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
22962296
let byte_len = size_of::<u8>() * len;
22972297
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
22982298
})
@@ -2357,7 +2357,7 @@ pub mod messaging {
23572357
.field("nid", &{ self.nid })
23582358
.field("subsystem_nqn", {
23592359
let ptr = addr_of!(self.subsystem_nqn);
2360-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
2360+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
23612361
let byte_len = size_of::<u8>() * len;
23622362
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
23632363
})
@@ -2616,7 +2616,7 @@ pub mod media {
26162616
.field("vendor_guid", &{ self.vendor_guid })
26172617
.field("vendor_defined_data", {
26182618
let ptr = addr_of!(self.vendor_defined_data);
2619-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
2619+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
26202620
let byte_len = size_of::<u8>() * len;
26212621
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
26222622
})
@@ -2655,7 +2655,7 @@ pub mod media {
26552655
#[must_use]
26562656
pub fn path_name(&self) -> UnalignedSlice<u16> {
26572657
let ptr: *const [u16] = addr_of!(self.path_name);
2658-
let (ptr, len): (*const (), usize) = PtrExt::to_raw_parts(ptr);
2658+
let (ptr, len): (*const (), usize) = ptr_meta::to_raw_parts(ptr);
26592659
unsafe { UnalignedSlice::new(ptr.cast::<u16>(), len) }
26602660
}
26612661
}
@@ -2665,7 +2665,7 @@ pub mod media {
26652665
f.debug_struct("FilePath")
26662666
.field("path_name", {
26672667
let ptr = addr_of!(self.path_name);
2668-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
2668+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
26692669
let byte_len = size_of::<u16>() * len;
26702670
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
26712671
})
@@ -2748,7 +2748,7 @@ pub mod media {
27482748
f.debug_struct("PiwgFirmwareFile")
27492749
.field("data", {
27502750
let ptr = addr_of!(self.data);
2751-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
2751+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
27522752
let byte_len = size_of::<u8>() * len;
27532753
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
27542754
})
@@ -2796,7 +2796,7 @@ pub mod media {
27962796
f.debug_struct("PiwgFirmwareVolume")
27972797
.field("data", {
27982798
let ptr = addr_of!(self.data);
2799-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
2799+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
28002800
let byte_len = size_of::<u8>() * len;
28012801
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
28022802
})
@@ -3018,7 +3018,7 @@ pub mod bios_boot_spec {
30183018
.field("status_flag", &{ self.status_flag })
30193019
.field("description_string", {
30203020
let ptr = addr_of!(self.description_string);
3021-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
3021+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
30223022
let byte_len = size_of::<u8>() * len;
30233023
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
30243024
})

‎uefi/src/proto/tcg/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ pub struct PcrEvent {
9090
}
9191

9292
impl PcrEvent {
93-
pub(super) unsafe fn from_ptr<'a>(ptr: *const u8) -> &'a Self {
93+
pub(super) const unsafe fn from_ptr<'a>(ptr: *const u8) -> &'a Self {
9494
// Get the `event_size` field.
9595
let ptr_u32: *const u32 = ptr.cast();
9696
let event_size = ptr_u32.add(7).read_unaligned();

‎uefi/src/proto/tcg/v2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::{Error, Result, Status, StatusExt};
1818
use core::fmt::{self, Debug, Formatter};
1919
use core::marker::PhantomData;
2020
use core::{mem, ptr, slice};
21-
use ptr_meta::{Pointee, PtrExt};
21+
use ptr_meta::Pointee;
2222
use uefi_raw::protocol::tcg::v2::{Tcg2EventHeader as EventHeader, Tcg2Protocol};
2323

2424
#[cfg(feature = "alloc")]
@@ -646,7 +646,7 @@ impl Tcg {
646646
event: &PcrEventInputs,
647647
) -> Result {
648648
let event: *const PcrEventInputs = event;
649-
let (event, _event_size) = PtrExt::to_raw_parts(event);
649+
let (event, _event_size) = ptr_meta::to_raw_parts(event);
650650
unsafe {
651651
(self.0.hash_log_extend_event)(
652652
&mut self.0,

‎xtask/src/device_path/field.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ impl NodeField {
264264
ret_type = quote!(UnalignedSlice<#slice_elem>);
265265
ret_val = quote!(
266266
let ptr: *const [#slice_elem] = addr_of!(self.#field_name);
267-
let (ptr, len): (*const (), usize) = PtrExt::to_raw_parts(ptr);
267+
let (ptr, len): (*const (), usize) = ptr_meta::to_raw_parts(ptr);
268268
unsafe {
269269
UnalignedSlice::new(ptr.cast::<#slice_elem>(), len)
270270
}

‎xtask/src/device_path/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn gen_uefi_code_as_string(groups: &[NodeGroup]) -> Result<String> {
8181
use core::mem::{size_of, size_of_val};
8282
use core::ptr::addr_of;
8383
use core::{fmt, slice};
84-
use ptr_meta::{Pointee, PtrExt};
84+
use ptr_meta::Pointee;
8585

8686
#(#packed_modules)*
8787

‎xtask/src/device_path/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl Node {
208208
// slice instead.
209209
quote!({
210210
let ptr = addr_of!(#field_val);
211-
let (ptr, len) = PtrExt::to_raw_parts(ptr);
211+
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
212212
let byte_len = size_of::<#slice_elem_ty>() * len;
213213
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
214214
})

0 commit comments

Comments
 (0)