commit 56f2641b1d22c29c0937a06308e8a2d5f32d1ddc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 10 08:20:40 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 10 08:20:40 2024 +0000
tree 62584a884fe65f9549ebc0ca5ef45140f51be6fc
parent 8f7db050c041ae4851df9d93d96b1b892c5ad9a7
parent 6177c66e2cdaf10636931644057b895f9482a3b5

Merge "Update source for Rust 1.78.0" into main

libs/libfdt/src/libfdt.rs

diff --git a/libs/libfdt/src/libfdt.rs b/libs/libfdt/src/libfdt.rs
index 1af9edf..9ddfbaa 100644
--- a/libs/libfdt/src/libfdt.rs
+++ b/libs/libfdt/src/libfdt.rs
@@ -311,6 +311,7 @@
     }
 
     /// Safe wrapper around `fdt_open_into()` (C function).
+    #[allow(dead_code)]
     fn open_into(&self, dest: &mut [u8]) -> Result<()> {
         let fdt = self.as_fdt_slice().as_ptr().cast();
 

virtualizationmanager/src/aidl.rs

diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index f939678..f1509e2 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -908,14 +908,14 @@
             append_kernel_param("androidboot.microdroid.mount_vendor=1", &mut vm_config)
         }
 
-        vm_config.devices = custom_config.devices.clone();
+        vm_config.devices.clone_from(&custom_config.devices);
     }
 
     if config.memoryMib > 0 {
         vm_config.memoryMib = config.memoryMib;
     }
 
-    vm_config.name = config.name.clone();
+    vm_config.name.clone_from(&config.name);
     vm_config.protectedVm = config.protectedVm;
     vm_config.cpuTopology = config.cpuTopology;