diff --git a/registry/src/endpoints/publish_version.rs b/registry/src/endpoints/publish_version.rs
index eb367b7..841494f 100644
--- a/registry/src/endpoints/publish_version.rs
+++ b/registry/src/endpoints/publish_version.rs
@@ -176,7 +176,10 @@ pub async fn publish_package(
 							})?;
 
 						set.insert(DocEntry {
-							label: info.label.or(h1).unwrap_or(file_name.to_case(Case::Title)),
+							label: info
+								.label
+								.or(h1)
+								.unwrap_or_else(|| file_name.to_case(Case::Title)),
 							position: info.sidebar_position,
 							kind: DocEntryKind::Page {
 								name: entry
diff --git a/registry/src/main.rs b/registry/src/main.rs
index 07f3d0f..e59900d 100644
--- a/registry/src/main.rs
+++ b/registry/src/main.rs
@@ -63,7 +63,7 @@ macro_rules! benv {
         std::env::var($name)
     };
     ($name:expr => $default:expr) => {
-        benv!($name).unwrap_or($default.to_string())
+        benv!($name).unwrap_or_else(|_| $default.to_string())
     };
     (required $name:expr) => {
         benv!($name).expect(concat!("Environment variable `", $name, "` must be set"))
diff --git a/src/cli/commands/add.rs b/src/cli/commands/add.rs
index c9a9c0f..35804d2 100644
--- a/src/cli/commands/add.rs
+++ b/src/cli/commands/add.rs
@@ -187,7 +187,7 @@ impl AddCommand {
 					.split('/')
 					.next_back()
 					.map(|s| s.to_string())
-					.unwrap_or(url.path.to_string()),
+					.unwrap_or_else(|| url.path.to_string()),
 				AnyPackageIdentifier::Workspace(versioned) => versioned.0.name().to_string(),
 				AnyPackageIdentifier::Path(path) => path
 					.file_name()
diff --git a/src/cli/commands/publish.rs b/src/cli/commands/publish.rs
index 3ef5f17..407d790 100644
--- a/src/cli/commands/publish.rs
+++ b/src/cli/commands/publish.rs
@@ -543,7 +543,7 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
 				manifest
 					.target
 					.lib_path()
-					.map_or("(none)".to_string(), |p| p.to_string())
+					.map_or_else(|| "(none)".to_string(), |p| p.to_string())
 			);
 
 			if roblox_target {
@@ -554,7 +554,7 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
 					manifest
 						.target
 						.bin_path()
-						.map_or("(none)".to_string(), |p| p.to_string())
+						.map_or_else(|| "(none)".to_string(), |p| p.to_string())
 				);
 				println!(
 					"\tscripts: {}",
@@ -562,9 +562,10 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
 						.target
 						.scripts()
 						.filter(|s| !s.is_empty())
-						.map_or("(none)".to_string(), |s| {
-							s.keys().cloned().collect::<Vec<_>>().join(", ")
-						})
+						.map_or_else(
+							|| "(none)".to_string(),
+							|s| { s.keys().cloned().collect::<Vec<_>>().join(", ") }
+						)
 				);
 			}
 
diff --git a/src/main.rs b/src/main.rs
index 9c2afe5..793f307 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -232,7 +232,7 @@ async fn run() -> anyhow::Result<()> {
 		project_root_dir.display(),
 		project_workspace_dir
 			.as_ref()
-			.map_or("none".to_string(), |p| p.display().to_string())
+			.map_or_else(|| "none".to_string(), |p| p.display().to_string())
 	);
 
 	let home_dir = home_dir()?;
diff --git a/src/names.rs b/src/names.rs
index 986a49d..31821e8 100644
--- a/src/names.rs
+++ b/src/names.rs
@@ -31,7 +31,7 @@ impl FromStr for PackageName {
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		let (scope, name) = s
 			.split_once('/')
-			.ok_or(Self::Err::InvalidFormat(s.to_string()))?;
+			.ok_or_else(|| Self::Err::InvalidFormat(s.to_string()))?;
 
 		for (reason, part) in [(ErrorReason::Scope, scope), (ErrorReason::Name, name)] {
 			let min_len = match reason {
@@ -218,7 +218,7 @@ pub mod wally {
 				.strip_prefix("wally#")
 				.unwrap_or(s)
 				.split_once('/')
-				.ok_or(Self::Err::InvalidFormat(s.to_string()))?;
+				.ok_or_else(|| Self::Err::InvalidFormat(s.to_string()))?;
 
 			for (reason, part) in [(ErrorReason::Scope, scope), (ErrorReason::Name, name)] {
 				if part.is_empty() || part.len() > 64 {
diff --git a/src/resolver.rs b/src/resolver.rs
index c8a735a..79f3643 100644
--- a/src/resolver.rs
+++ b/src/resolver.rs
@@ -182,7 +182,7 @@ impl Project {
 							manifest
 								.indices
 								.get(&specifier.index)
-								.ok_or(errors::DependencyGraphError::IndexNotFound(
+								.ok_or_else(|| errors::DependencyGraphError::IndexNotFound(
 									specifier.index.to_string(),
 								))?
 								.clone()
@@ -202,7 +202,7 @@ impl Project {
 							manifest
 								.wally_indices
 								.get(&specifier.index)
-								.ok_or(errors::DependencyGraphError::WallyIndexNotFound(
+								.ok_or_else(|| errors::DependencyGraphError::WallyIndexNotFound(
 									specifier.index.to_string(),
 								))?
 								.clone()
diff --git a/src/source/fs.rs b/src/source/fs.rs
index 3cbb8a7..70ba16a 100644
--- a/src/source/fs.rs
+++ b/src/source/fs.rs
@@ -178,14 +178,9 @@ async fn package_fs_copy(
 		let path = entry.path();
 		let relative_path = path.strip_prefix(src).unwrap();
 		let dest_path = destination.join(relative_path);
-		let file_name = relative_path
-			.file_name()
-			.unwrap()
-			.to_str()
-			.ok_or(std::io::Error::new(
-				std::io::ErrorKind::InvalidData,
-				"invalid file name",
-			))?;
+		let file_name = relative_path.file_name().unwrap().to_str().ok_or_else(|| {
+			std::io::Error::new(std::io::ErrorKind::InvalidData, "invalid file name")
+		})?;
 
 		if entry.file_type().await?.is_dir() {
 			if IGNORED_DIRS.contains(&file_name) {