chore: get rid of unnecessary String allocations

Author: fogti

src/create.rs

@@ -39,7 +39,7 @@ pub fn create_container(
 	let container = OCIContainer::new(
 		bundle.to_str().unwrap().to_owned(),
 		id.to_string(),
-		pidfile.clone().map_or(
+		pidfile.as_ref().map_or(
 			container_dir.to_str().unwrap().to_owned() + "/containerpid",
 			|x| x.to_str().unwrap().to_string(),
 		),
@@ -245,8 +245,7 @@ pub fn create_container(
 	let rootfs_path_str = rootfs_path_abs
 		.as_os_str()
 		.to_str()
-		.expect("Could not convert rootfs-path to string!")
-		.to_string();
+		.expect("Could not convert rootfs-path to string!");
 
 	debug!(
 		"Write rootfs-path {} (lenght {}) to init-pipe!",

src/hermit.rs

@@ -54,45 +54,42 @@ pub fn get_qemu_args(
 		"-initrd",
 		app,
 	]
-	.iter()
+	.into_iter()
 	.map(|s| s.to_string())
 	.collect();
 
 	if let Some(kvm) = crate::CONFIG.kvm {
 		if kvm && kvm_support {
-			exec_args.append(
-				&mut ["--enable-kvm", "-cpu", "host"]
+			exec_args.extend(
+				["--enable-kvm", "-cpu", "host"]
 					.iter()
-					.map(|s| s.to_string())
-					.collect(),
+					.map(|s| s.to_string()),
 			);
 		} else {
-			exec_args.append(
-				&mut [
+			exec_args.extend(
+				[
 					"-cpu",
 					"qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand",
 				]
 				.iter()
-				.map(|s| s.to_string())
-				.collect(),
+				.map(|s| s.to_string()),
 			);
 		}
 	} else {
 		// disable kvm support, if the configuration file doesn't enable it
-		exec_args.append(
-			&mut [
+		exec_args.extend(
+			[
 				"-cpu",
 				"qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand",
 			]
 			.iter()
-			.map(|s| s.to_string())
-			.collect(),
+			.map(|s| s.to_string()),
 		);
 	}
 
 	if micro_vm {
-		exec_args.append(
-			&mut [
+		exec_args.extend(
+			[
 				"-M",
 				"microvm,x-option-roms=off,pit=off,pic=off,rtc=on,auto-kernel-cmdline=off,acpi=off",
 				"-global",
@@ -101,12 +98,11 @@ pub fn get_qemu_args(
 				"-no-user-config",
 			]
 			.iter()
-			.map(|s| s.to_string())
-			.collect(),
+			.map(|s| s.to_string()),
 		);
 	} else {
-		exec_args.append(
-			&mut [
+		exec_args.extend(
+			[
 				"-chardev",
 				"socket,id=char0,path=/run/vhostqemu",
 				"-device",
@@ -117,8 +113,7 @@ pub fn get_qemu_args(
 				"node,memdev=mem",
 			]
 			.iter()
-			.map(|s| s.to_string())
-			.collect(),
+			.map(|s| s.to_string()),
 		);
 	}
 
@@ -145,13 +140,15 @@ pub fn get_qemu_args(
 			args_string
 		}
 		NetworkConfig::UserNetwork(user_port) => {
-			exec_args.push("-netdev".to_string());
-			exec_args.push(format!(
-				"user,id=u1,hostfwd=tcp::{user_port}-:{user_port},net=192.168.76.0/24,dhcpstart=192.168.76.9"
-			));
-			exec_args.push("-device".to_string());
-			exec_args.push("virtio-net-pci,netdev=u1,disable-legacy=on".to_string());
-			exec_args.push("-append".to_string());
+			exec_args.extend([
+				"-netdev".to_string(),
+				format!(
+					"user,id=u1,hostfwd=tcp::{user_port}-:{user_port},net=192.168.76.0/24,dhcpstart=192.168.76.9"
+				),
+				"-device".to_string(),
+				"virtio-net-pci,netdev=u1,disable-legacy=on".to_string(),
+				"-append".to_string(),
+			]);
 
 			"".to_string()
 		}

src/init.rs

@@ -620,7 +620,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 			.expect("RUNH_MICRO_VM was not an unsigned integer!");
 
 		if micro_vm == 0 {
-			let virtiofsd_args: Vec<String> = [
+			let virtiofsd_args: Vec<&str> = vec![
 				"virtiofsd",
 				"--socket-path=/run/vhostqemu",
 				"--shared-dir",
@@ -630,10 +630,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 				"--seccomp",
 				"none",
 				"--inode-file-handles=never",
-			]
-			.iter()
-			.map(|s| s.to_string())
-			.collect();
+			];
 
 			info!("Initialize virtiofsd: {}", virtiofsd_args.join(" "));
 

src/list.rs

@@ -72,7 +72,7 @@ pub fn list_containers(project_dir: PathBuf) {
 				if let Ok(container) = serde_json::from_str::<OCIContainer>(&contents) {
 					println!(
 						"{0: <12} {1: <12} {2: <12} {3: <12} {4: <12} {5: <12}",
-						dir.file_name().into_string().unwrap(),
+						dir.file_name().to_str().unwrap(),
 						"",
 						status,
 						container.bundle(),

src/mounts.rs

@@ -82,16 +82,14 @@ pub fn configure_mounts(
 			debug!(
 				"Mounting {:?} with type {} and options {:?}",
 				destination_resolved,
-				mount.typ().as_ref().unwrap_or(&"none".to_string()),
+				mount.typ().as_deref().unwrap_or("none"),
 				mount.options().as_ref().unwrap_or(&vec![])
 			);
 
 			let is_bind_mount = mount
 				.options()
 				.as_ref()
-				.map(|options| {
-					options.contains(&"bind".to_string()) || options.contains(&"rbind".to_string())
-				})
+				.map(|options| options.iter().any(|i| i == "bind" || i == "rbind"))
 				.unwrap_or(false);
 			if is_bind_mount {
 				if destination_resolved.parent().map(|i| i == rootfs) == Some(true)