Skip to content

Commit 5f73fab

Browse files
phip1611phip1611
committed
rust: fix device path code generation for 2024 edition
rust: fix unsafe entry attribute
1 parent cd14df5 commit 5f73fab

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ pub mod hardware {
274274
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
275275
f.debug_struct("Vendor")
276276
.field("vendor_guid", &{ self.vendor_guid })
277-
.field("vendor_defined_data", {
277+
.field("vendor_defined_data", &{
278278
let ptr = addr_of!(self.vendor_defined_data);
279279
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
280280
let byte_len = size_of::<u8>() * len;
281-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
281+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
282282
})
283283
.finish()
284284
}
@@ -580,11 +580,11 @@ pub mod acpi {
580580
impl fmt::Debug for Adr {
581581
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
582582
f.debug_struct("Adr")
583-
.field("adr", {
583+
.field("adr", &{
584584
let ptr = addr_of!(self.adr);
585585
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
586586
let byte_len = size_of::<u32>() * len;
587-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
587+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
588588
})
589589
.finish()
590590
}
@@ -1187,11 +1187,11 @@ pub mod messaging {
11871187
.field("interface_number", &{ self.interface_number })
11881188
.field("device_vendor_id", &{ self.device_vendor_id })
11891189
.field("device_product_id", &{ self.device_product_id })
1190-
.field("serial_number", {
1190+
.field("serial_number", &{
11911191
let ptr = addr_of!(self.serial_number);
11921192
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
11931193
let byte_len = size_of::<u16>() * len;
1194-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
1194+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
11951195
})
11961196
.finish()
11971197
}
@@ -1841,11 +1841,11 @@ pub mod messaging {
18411841
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
18421842
f.debug_struct("Vendor")
18431843
.field("vendor_guid", &{ self.vendor_guid })
1844-
.field("vendor_defined_data", {
1844+
.field("vendor_defined_data", &{
18451845
let ptr = addr_of!(self.vendor_defined_data);
18461846
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
18471847
let byte_len = size_of::<u8>() * len;
1848-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
1848+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
18491849
})
18501850
.finish()
18511851
}
@@ -1997,11 +1997,11 @@ pub mod messaging {
19971997
.field("options", &{ self.options })
19981998
.field("logical_unit_number", &{ self.logical_unit_number })
19991999
.field("target_portal_group_tag", &{ self.target_portal_group_tag })
2000-
.field("iscsi_target_name", {
2000+
.field("iscsi_target_name", &{
20012001
let ptr = addr_of!(self.iscsi_target_name);
20022002
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
20032003
let byte_len = size_of::<u8>() * len;
2004-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
2004+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
20052005
})
20062006
.finish()
20072007
}
@@ -2104,11 +2104,11 @@ pub mod messaging {
21042104
impl fmt::Debug for Uri {
21052105
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
21062106
f.debug_struct("Uri")
2107-
.field("value", {
2107+
.field("value", &{
21082108
let ptr = addr_of!(self.value);
21092109
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
21102110
let byte_len = size_of::<u8>() * len;
2111-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
2111+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
21122112
})
21132113
.finish()
21142114
}
@@ -2435,11 +2435,11 @@ pub mod messaging {
24352435
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
24362436
f.debug_struct("Dns")
24372437
.field("address_type", &{ self.address_type })
2438-
.field("addresses", {
2438+
.field("addresses", &{
24392439
let ptr = addr_of!(self.addresses);
24402440
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
24412441
let byte_len = size_of::<IpAddress>() * len;
2442-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
2442+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
24432443
})
24442444
.finish()
24452445
}
@@ -2540,11 +2540,11 @@ pub mod messaging {
25402540
f.debug_struct("RestService")
25412541
.field("service_type", &{ self.service_type })
25422542
.field("access_mode", &{ self.access_mode })
2543-
.field("vendor_guid_and_data", {
2543+
.field("vendor_guid_and_data", &{
25442544
let ptr = addr_of!(self.vendor_guid_and_data);
25452545
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
25462546
let byte_len = size_of::<u8>() * len;
2547-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
2547+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
25482548
})
25492549
.finish()
25502550
}
@@ -2611,11 +2611,11 @@ pub mod messaging {
26112611
f.debug_struct("NvmeOfNamespace")
26122612
.field("nidt", &{ self.nidt })
26132613
.field("nid", &{ self.nid })
2614-
.field("subsystem_nqn", {
2614+
.field("subsystem_nqn", &{
26152615
let ptr = addr_of!(self.subsystem_nqn);
26162616
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
26172617
let byte_len = size_of::<u8>() * len;
2618-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
2618+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
26192619
})
26202620
.finish()
26212621
}
@@ -2888,11 +2888,11 @@ pub mod media {
28882888
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
28892889
f.debug_struct("Vendor")
28902890
.field("vendor_guid", &{ self.vendor_guid })
2891-
.field("vendor_defined_data", {
2891+
.field("vendor_defined_data", &{
28922892
let ptr = addr_of!(self.vendor_defined_data);
28932893
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
28942894
let byte_len = size_of::<u8>() * len;
2895-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
2895+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
28962896
})
28972897
.finish()
28982898
}
@@ -2943,11 +2943,11 @@ pub mod media {
29432943
impl fmt::Debug for FilePath {
29442944
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
29452945
f.debug_struct("FilePath")
2946-
.field("path_name", {
2946+
.field("path_name", &{
29472947
let ptr = addr_of!(self.path_name);
29482948
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
29492949
let byte_len = size_of::<u16>() * len;
2950-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
2950+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
29512951
})
29522952
.finish()
29532953
}
@@ -3038,11 +3038,11 @@ pub mod media {
30383038
impl fmt::Debug for PiwgFirmwareFile {
30393039
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
30403040
f.debug_struct("PiwgFirmwareFile")
3041-
.field("data", {
3041+
.field("data", &{
30423042
let ptr = addr_of!(self.data);
30433043
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
30443044
let byte_len = size_of::<u8>() * len;
3045-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
3045+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
30463046
})
30473047
.finish()
30483048
}
@@ -3092,11 +3092,11 @@ pub mod media {
30923092
impl fmt::Debug for PiwgFirmwareVolume {
30933093
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
30943094
f.debug_struct("PiwgFirmwareVolume")
3095-
.field("data", {
3095+
.field("data", &{
30963096
let ptr = addr_of!(self.data);
30973097
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
30983098
let byte_len = size_of::<u8>() * len;
3099-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
3099+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
31003100
})
31013101
.finish()
31023102
}
@@ -3332,11 +3332,11 @@ pub mod bios_boot_spec {
33323332
f.debug_struct("BootSpecification")
33333333
.field("device_type", &{ self.device_type })
33343334
.field("status_flag", &{ self.status_flag })
3335-
.field("description_string", {
3335+
.field("description_string", &{
33363336
let ptr = addr_of!(self.description_string);
33373337
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
33383338
let byte_len = size_of::<u8>() * len;
3339-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
3339+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
33403340
})
33413341
.finish()
33423342
}

‎xtask/src/device_path/node.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ impl Node {
208208
// It's not trivial to nicely format the DST data since
209209
// the slice might be unaligned. Treat it as a byte
210210
// slice instead.
211-
quote!({
211+
quote!(&{
212212
let ptr = addr_of!(#field_val);
213213
let (ptr, len) = ptr_meta::to_raw_parts(ptr);
214214
let byte_len = size_of::<#slice_elem_ty>() * len;
215-
unsafe { &slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
215+
unsafe { slice::from_raw_parts(ptr.cast::<u8>(), byte_len) }
216216
})
217217
} else {
218218
// Wrap in `{...}` to make a copy of the (potentially

0 commit comments

Comments
 (0)