Skip to content

Commit 5772618

Browse files
authored
Misc 2024 edition compatibility fixes (#989)
Some temporary lifetime changes and match restrictions. Found through #988. Part of #288
1 parent e772f64 commit 5772618

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Diff for: flowey/flowey_cli/src/pipeline_resolver/ado_yaml.rs

+1
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ echo "$(FLOWEY_TEMP_DIR)/work" | {var_db_insert_working_dir}
267267
"###
268268
)
269269
.trim_start()
270+
.to_owned()
270271
})?;
271272

272273
// import pipeline vars being used by the job into flowey

Diff for: flowey/flowey_cli/src/pipeline_resolver/github_yaml/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ echo "{RUNNER_TEMP}/work" | {var_db_insert_working_dir}
337337
"###
338338
)
339339
.trim_start()
340+
.to_owned()
340341
})?;
341342

342343
// import pipeline vars being used by the job into flowey

Diff for: openhcl/underhill_core/src/loader/mod.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,9 @@ pub fn write_uefi_config(
541541
&platform_config.smbios.chassis_asset_tag,
542542
);
543543

544-
cfg.add({
545-
&config::NvdimmCount {
546-
count: platform_config.general.nvdimm_count,
547-
padding: [0; 3],
548-
}
544+
cfg.add(&config::NvdimmCount {
545+
count: platform_config.general.nvdimm_count,
546+
padding: [0; 3],
549547
});
550548

551549
if let Some(instance_guid) = platform_config.general.vpci_instance_filter {

Diff for: support/mesh/mesh_derive/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ fn derive_enum(
919919
});
920920

921921
sizes.push(quote! {
922-
#variant_destructured_ref => {
922+
&mut #variant_destructured_ref => {
923923
const NUMBERS: &[u32] = &[#(#field_number,)*];
924924
let entries = const { &[#(<#field_encoding as #protobuf_mod::FieldEncode<#field_types, #resource_type>>::ENTRY.erase(),)*] };
925925
// SAFETY: the fields are in the same object as `self`.

0 commit comments

Comments
 (0)