diff --git a/osdk/src/config/scheme/action.rs b/osdk/src/config/scheme/action.rs index f53b458ba..e58a74135 100644 --- a/osdk/src/config/scheme/action.rs +++ b/osdk/src/config/scheme/action.rs @@ -50,7 +50,7 @@ impl Build { pub fn apply_common_args(&mut self, common_args: &CommonArgs) { let build_args = &common_args.build_args; if let Some(profile) = build_args.profile() { - self.profile = profile.clone(); + self.profile.clone_from(&profile); } self.features.extend(build_args.features.clone()); self.override_configs @@ -67,7 +67,7 @@ impl Build { impl BuildScheme { pub fn inherit(&mut self, parent: &Self) { if self.profile.is_none() { - self.profile = parent.profile.clone(); + self.profile.clone_from(&parent.profile); } self.features = { let mut features = parent.features.clone(); diff --git a/osdk/src/config/scheme/boot.rs b/osdk/src/config/scheme/boot.rs index a27410695..b1b0800d8 100644 --- a/osdk/src/config/scheme/boot.rs +++ b/osdk/src/config/scheme/boot.rs @@ -60,7 +60,7 @@ impl BootScheme { init_args }; if self.initramfs.is_none() { - self.initramfs = from.initramfs.clone(); + self.initramfs.clone_from(&from.initramfs); } if self.method.is_none() { self.method = from.method; diff --git a/osdk/src/config/scheme/grub.rs b/osdk/src/config/scheme/grub.rs index 47be5394d..49ceb1b67 100644 --- a/osdk/src/config/scheme/grub.rs +++ b/osdk/src/config/scheme/grub.rs @@ -43,7 +43,7 @@ impl Default for Grub { impl GrubScheme { pub fn inherit(&mut self, from: &Self) { if self.grub_mkrescue.is_none() { - self.grub_mkrescue = from.grub_mkrescue.clone(); + self.grub_mkrescue.clone_from(&from.grub_mkrescue); } if self.boot_protocol.is_none() { self.boot_protocol = from.boot_protocol; diff --git a/osdk/src/config/scheme/mod.rs b/osdk/src/config/scheme/mod.rs index 48655d0dd..0d609561a 100644 --- a/osdk/src/config/scheme/mod.rs +++ b/osdk/src/config/scheme/mod.rs @@ -69,17 +69,17 @@ impl Scheme { if let Some(qemu) = &mut self.qemu { if let Some(from_qemu) = &from.qemu { if qemu.args.is_none() { - qemu.args = from_qemu.args.clone(); - self.work_dir = from.work_dir.clone(); + qemu.args.clone_from(&from_qemu.args); + self.work_dir.clone_from(&from.work_dir); } if qemu.path.is_none() { - qemu.path = from_qemu.path.clone(); - self.work_dir = from.work_dir.clone(); + qemu.path.clone_from(&from_qemu.path); + self.work_dir.clone_from(&from.work_dir); } } } else { - self.qemu = from.qemu.clone(); - self.work_dir = from.work_dir.clone(); + self.qemu.clone_from(&from.qemu); + self.work_dir.clone_from(&from.work_dir); } } } diff --git a/osdk/src/config/scheme/qemu.rs b/osdk/src/config/scheme/qemu.rs index 7a510268f..1a19200ee 100644 --- a/osdk/src/config/scheme/qemu.rs +++ b/osdk/src/config/scheme/qemu.rs @@ -53,10 +53,10 @@ impl Qemu { impl QemuScheme { pub fn inherit(&mut self, from: &Self) { if self.args.is_none() { - self.args = from.args.clone(); + self.args.clone_from(&from.args); } if self.path.is_none() { - self.path = from.path.clone(); + self.path.clone_from(&from.path); } }