chore: get rid of unnecessary PathBuf allocations

Author: fogti

src/console.rs

@@ -21,14 +21,15 @@ pub fn setup_console(console_socket: File, win_size: Option<&nix::pty::Winsize>)
 	nix::pty::unlockpt(&master_fd).expect("Could not unlockpt!");
 
 	// Get the name of the slave
-	let slave_name = nix::pty::ptsname_r(&master_fd).expect("Could not get ptsname!");
+	let slave_name =
+		PathBuf::from(nix::pty::ptsname_r(&master_fd).expect("Could not get ptsname!"));
 
 	if let Some(winsize) = win_size {
 		unsafe { ioctl_set_winsize(master_fd.as_raw_fd(), winsize as *const libc::winsize) }
 			.expect("Could not set winsize using ioctl!");
 	}
 
-	mounts::mount_console(&PathBuf::from(&slave_name));
+	mounts::mount_console(&slave_name);
 
 	//Send master fd over console_socket
 	nix::sys::socket::sendmsg::<()>(
@@ -40,12 +41,8 @@ pub fn setup_console(console_socket: File, win_size: Option<&nix::pty::Winsize>)
 	)
 	.expect("Could not send message to console socket!");
 
-	let slave_fd = nix::fcntl::open(
-		std::path::Path::new(&slave_name),
-		OFlag::O_RDWR,
-		Mode::empty(),
-	)
-	.expect("Could not open pty slave path!");
+	let slave_fd = nix::fcntl::open(&slave_name, OFlag::O_RDWR, Mode::empty())
+		.expect("Could not open pty slave path!");
 	for i in 0..3 {
 		nix::unistd::dup3(slave_fd, i, OFlag::empty())
 			.unwrap_or_else(|_| panic!("Could not dup3 pty slave_fd onto fd {}", i));

src/container.rs

@@ -24,9 +24,9 @@ pub struct OCIContainer {
 
 impl OCIContainer {
 	pub fn new(bundle: String, id: String, pidfile: String) -> Self {
-		let mut config = std::path::PathBuf::from(bundle.clone());
-		config.push("config.json");
 		let can_path = std::fs::canonicalize(bundle).expect("Unable to determine absolute path");
+		let mut config = can_path.clone();
+		config.push("config.json");
 
 		Self {
 			id,

src/create.rs

@@ -17,7 +17,7 @@ use std::os::unix::fs;
 use std::os::unix::fs::OpenOptionsExt;
 use std::os::unix::net::UnixStream;
 use std::os::unix::prelude::CommandExt;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
 use crate::container::OCIContainer;
@@ -34,7 +34,7 @@ pub fn create_container(
 ) {
 	let _ = std::fs::create_dir(&project_dir);
 
-	let container_dir = rootfs::resolve_in_rootfs(&PathBuf::from(id), &project_dir);
+	let container_dir = rootfs::resolve_in_rootfs(Path::new(id), &project_dir);
 	std::fs::create_dir(container_dir.clone()).expect("Unable to create container directory");
 	let container = OCIContainer::new(
 		bundle.to_str().unwrap().to_owned(),
@@ -74,9 +74,9 @@ pub fn create_container(
 	}
 
 	// find rootfs
-	let bundle_rootfs_path = PathBuf::from(&container.spec().root().as_ref().unwrap().path());
+	let bundle_rootfs_path = container.spec().root().as_ref().unwrap().path();
 	let bundle_rootfs_path_abs = std::fs::canonicalize(if bundle_rootfs_path.is_absolute() {
-		bundle_rootfs_path
+		bundle_rootfs_path.to_path_buf()
 	} else {
 		let rootfs = &bundle;
 		rootfs.join(bundle_rootfs_path)
@@ -93,12 +93,12 @@ pub fn create_container(
 		.as_ref()
 		.unwrap();
 
-	let exec_path_rel = PathBuf::from(
+	let exec_path_rel = Path::new(
 		exec_args
 			.first()
 			.expect("Container spec does not contain any args!"),
 	);
-	let exec_path_abs = rootfs::resolve_in_rootfs(&exec_path_rel, &bundle_rootfs_path_abs);
+	let exec_path_abs = rootfs::resolve_in_rootfs(exec_path_rel, &bundle_rootfs_path_abs);
 	let is_hermit_container = if exec_path_abs.exists() {
 		hermit::is_hermit_app(&exec_path_abs)
 	} else {

src/delete.rs

@@ -16,9 +16,9 @@ use std::path::PathBuf;
 // 		let network_file = std::fs::File::open(network_file_path)?;
 // 		let buf_reader = BufReader::new(network_file);
 // 		let network_config: network::HermitNetworkConfig = serde_json::from_reader(buf_reader)?;
-// 		let namespace_file = File::open(PathBuf::from(
+// 		let namespace_file = File::open(
 // 			network_config.network_namespace.as_ref().unwrap(),
-// 		))?;
+// 		)?;
 // 		nix::sched::setns(namespace_file.as_raw_fd(), CloneFlags::CLONE_NEWNET)?;
 
 // 		network::undo_tap_creation(&network_config)?;

src/devices.rs

@@ -1,6 +1,4 @@
-use std::{
-	convert::TryInto, fs::OpenOptions, os::unix::prelude::OpenOptionsExt, path::Path, path::PathBuf,
-};
+use std::{convert::TryInto, fs::OpenOptions, os::unix::prelude::OpenOptionsExt, path::Path};
 
 use nix::{
 	mount::MsFlags,
@@ -14,7 +12,7 @@ use crate::{mounts, rootfs};
 pub fn create_devices(spec_devices: &Option<Vec<runtime::LinuxDevice>>, rootfs: &Path) {
 	let mut default_devices = vec![
 		runtime::LinuxDeviceBuilder::default()
-			.path(PathBuf::from("/dev/null"))
+			.path("/dev/null")
 			.file_mode(0o666u32)
 			.typ(runtime::LinuxDeviceType::C)
 			.major(1)
@@ -24,7 +22,7 @@ pub fn create_devices(spec_devices: &Option<Vec<runtime::LinuxDevice>>, rootfs:
 			.build()
 			.unwrap(),
 		runtime::LinuxDeviceBuilder::default()
-			.path(PathBuf::from("/dev/zero"))
+			.path("/dev/zero")
 			.file_mode(0o666u32)
 			.typ(runtime::LinuxDeviceType::C)
 			.major(1)
@@ -34,7 +32,7 @@ pub fn create_devices(spec_devices: &Option<Vec<runtime::LinuxDevice>>, rootfs:
 			.build()
 			.unwrap(),
 		runtime::LinuxDeviceBuilder::default()
-			.path(PathBuf::from("/dev/full"))
+			.path("/dev/full")
 			.file_mode(0o666u32)
 			.typ(runtime::LinuxDeviceType::C)
 			.major(1)
@@ -44,7 +42,7 @@ pub fn create_devices(spec_devices: &Option<Vec<runtime::LinuxDevice>>, rootfs:
 			.build()
 			.unwrap(),
 		runtime::LinuxDeviceBuilder::default()
-			.path(PathBuf::from("/dev/random"))
+			.path("/dev/random")
 			.file_mode(0o666u32)
 			.typ(runtime::LinuxDeviceType::C)
 			.major(1)
@@ -54,7 +52,7 @@ pub fn create_devices(spec_devices: &Option<Vec<runtime::LinuxDevice>>, rootfs:
 			.build()
 			.unwrap(),
 		runtime::LinuxDeviceBuilder::default()
-			.path(PathBuf::from("/dev/urandom"))
+			.path("/dev/urandom")
 			.file_mode(0o666u32)
 			.typ(runtime::LinuxDeviceType::C)
 			.major(1)
@@ -64,7 +62,7 @@ pub fn create_devices(spec_devices: &Option<Vec<runtime::LinuxDevice>>, rootfs:
 			.build()
 			.unwrap(),
 		runtime::LinuxDeviceBuilder::default()
-			.path(PathBuf::from("/dev/tty"))
+			.path("/dev/tty")
 			.file_mode(0o666u32)
 			.typ(runtime::LinuxDeviceType::C)
 			.major(5)
@@ -96,14 +94,12 @@ pub fn create_devices(spec_devices: &Option<Vec<runtime::LinuxDevice>>, rootfs:
 		if !destination_resolved.starts_with(rootfs) {
 			panic!("Device at {:?} cannot be mounted into rootfs!", dev.path());
 		}
-		mounts::create_all_dirs(&PathBuf::from(
-			&destination_resolved.parent().unwrap_or_else(|| {
-				panic!(
-					"Could create device at destination {:?} which has no parent dir!",
-					destination_resolved
-				)
-			}),
-		));
+		mounts::create_all_dirs(destination_resolved.parent().unwrap_or_else(|| {
+			panic!(
+				"Could create device at destination {:?} which has no parent dir!",
+				destination_resolved
+			)
+		}));
 
 		//Just assume we are not in a user namespace and that mknod will work. Error out if it does not (FIXME ?)
 		let node_kind = match dev.typ() {
@@ -158,8 +154,8 @@ fn verify_device(path: &Path, major_exp: u64, minor_exp: u64) {
 }
 
 pub fn create_tun(rootfs: &Path, uid: Uid, gid: Gid) {
-	let destination_relative = PathBuf::from("/dev/net/tun");
-	let destination_resolved = rootfs::resolve_in_rootfs(&destination_relative, rootfs);
+	let destination_relative = Path::new("/dev/net/tun");
+	let destination_resolved = rootfs::resolve_in_rootfs(destination_relative, rootfs);
 	if !destination_resolved.starts_with(rootfs) {
 		panic!(
 			"Device at {:?} cannot be mounted into rootfs!",
@@ -174,7 +170,7 @@ pub fn create_tun(rootfs: &Path, uid: Uid, gid: Gid) {
 		)
 	});
 	if !parent.exists() {
-		mounts::create_all_dirs(&PathBuf::from(&destination_resolved.parent().unwrap()));
+		mounts::create_all_dirs(destination_resolved.parent().unwrap());
 	}
 
 	if destination_resolved.exists() {
@@ -194,13 +190,13 @@ pub fn create_tun(rootfs: &Path, uid: Uid, gid: Gid) {
 
 pub fn mount_hermit_devices(rootfs: &Path) {
 	if std::fs::metadata("/dev/kvm").is_ok() {
-		mount_device(rootfs, &PathBuf::from("/dev/kvm"), 10, 232);
+		mount_device(rootfs, Path::new("/dev/kvm"), 10, 232);
 	} else {
 		warn!("/dev/kvm doesn't exist and is consequently not supported!");
 	}
 
 	if std::fs::metadata("/dev/vhost-net").is_ok() {
-		mount_device(rootfs, &PathBuf::from("/dev/vhost-net"), 10, 238);
+		mount_device(rootfs, Path::new("/dev/vhost-net"), 10, 238);
 	} else {
 		warn!("/dev/vhost-net doesn't exist and is consequently not supported!");
 	}
@@ -216,7 +212,7 @@ fn mount_device(rootfs: &Path, destination_rel: &Path, major: u64, minor: u64) {
 	});
 
 	if !parent.exists() {
-		mounts::create_all_dirs(&PathBuf::from(&destination.parent().unwrap()));
+		mounts::create_all_dirs(destination.parent().unwrap());
 	}
 
 	if destination.exists() {
@@ -253,7 +249,7 @@ fn mount_device(rootfs: &Path, destination_rel: &Path, major: u64, minor: u64) {
 }
 
 pub fn setup_dev_symlinks(rootfs: &Path) {
-	// if PathBuf::from("/proc/kcore").exists() {
+	// if Path::new("/proc/kcore").exists() {
 	// 	nix::unistd::symlinkat("/proc/kcore", None, &rootfs.join("dev/core"))
 	// 		.expect("Could not symlink /proc/kcore to /dev/core");
 	// }

src/init.rs

@@ -3,7 +3,7 @@ use std::io::{Read, Write};
 use std::os::fd::{AsRawFd, OwnedFd};
 use std::os::unix::prelude::{IntoRawFd, OpenOptionsExt};
 use std::os::unix::process::CommandExt;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::{
 	env,
 	fs::File,
@@ -324,34 +324,34 @@ fn init_stage_child(args: SetupArgs) -> ! {
 			.expect("Could not setup network lo interface!");
 	}
 
-	let rootfs_path = PathBuf::from(args.config.rootfs);
-	let bundle_rootfs_path = PathBuf::from(args.config.bundle_rootfs);
+	let rootfs_path = Path::new(&args.config.rootfs);
+	let bundle_rootfs_path = Path::new(&args.config.bundle_rootfs);
 
 	//Mount root file system
-	rootfs::mount_rootfs(&args.config.spec, &rootfs_path);
+	rootfs::mount_rootfs(&args.config.spec, rootfs_path);
 
 	//Setup mounts and devices
 	let setup_dev = if let Some(mounts) = args.config.spec.mounts() {
 		mounts::configure_mounts(
 			mounts,
-			&rootfs_path,
-			&bundle_rootfs_path,
+			rootfs_path,
+			bundle_rootfs_path,
 			args.config.spec.linux().as_ref().unwrap().mount_label(),
 		)
 	} else {
 		true
 	};
 
 	if setup_dev {
-		devices::create_devices(linux_spec.devices(), &rootfs_path);
-		devices::setup_ptmx(&rootfs_path);
-		devices::setup_dev_symlinks(&rootfs_path);
+		devices::create_devices(linux_spec.devices(), rootfs_path);
+		devices::setup_ptmx(rootfs_path);
+		devices::setup_dev_symlinks(rootfs_path);
 	}
 
 	if args.config.is_hermit_container {
-		devices::mount_hermit_devices(&rootfs_path);
+		devices::mount_hermit_devices(rootfs_path);
 		devices::create_tun(
-			&rootfs_path,
+			rootfs_path,
 			Uid::from_raw(args.config.spec.process().as_ref().unwrap().user().uid()),
 			Gid::from_raw(args.config.spec.process().as_ref().unwrap().user().gid()),
 		);
@@ -376,7 +376,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 		);
 	}
 
-	nix::unistd::chdir(&rootfs_path).unwrap_or_else(|_| {
+	nix::unistd::chdir(rootfs_path).unwrap_or_else(|_| {
 		panic!(
 			"Could not change directory to rootfs path {:?}",
 			rootfs_path
@@ -386,7 +386,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 	//TODO: Run create hooks
 
 	if args.config.cloneflags.contains(CloneFlags::CLONE_NEWNS) {
-		rootfs::pivot_root(&rootfs_path);
+		rootfs::pivot_root(rootfs_path);
 	} else {
 		nix::unistd::chroot(".").expect("Could not chroot into current directory!");
 		nix::unistd::chdir("/").expect("Could not chdir to / after chroot!");
@@ -419,7 +419,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 
 	let cwd = args.config.spec.process().as_ref().unwrap().cwd();
 	if !cwd.as_os_str().is_empty() {
-		mounts::create_all_dirs(&PathBuf::from(cwd));
+		mounts::create_all_dirs(Path::new(&cwd));
 	}
 
 	//Setup console
@@ -524,7 +524,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 			.first()
 			.expect("Container spec does not contain any args!")
 			.as_str();
-		let app_root = PathBuf::from(app)
+		let app_root = Path::new(app)
 			.parent()
 			.expect("App path does not have a parent!")
 			.to_owned();
@@ -575,7 +575,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 			.clone()
 	};
 
-	let exec_path_rel = PathBuf::from(
+	let exec_path_rel = Path::new(
 		exec_args
 			.first()
 			.expect("Container spec does not contain any args!"),
@@ -637,7 +637,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
 
 			info!("Initialize virtiofsd: {}", virtiofsd_args.join(" "));
 
-			let virtiofsd_path_rel = PathBuf::from(
+			let virtiofsd_path_rel = Path::new(
 				virtiofsd_args
 					.first()
 					.expect("Container spec does not contain any args!"),