Merge remote-tracking branch 'origin/main' into connor4312/cli-self-update

cli/src/util/command.rs

@@ -26,7 +26,7 @@ where
 				e,
 				format!(
 					"failed to execute command '{}'",
-					(&command_str).as_ref().to_string_lossy()
+					command_str.as_ref().to_string_lossy()
 				),
 			)
 		})

cli/src/util/sync.rs

@@ -19,9 +19,7 @@ where
 	/// Waits for the barrier to be closed, returning a value if one was sent.
 	pub async fn wait(&mut self) -> Result<T, RecvError> {
 		loop {
-			if let Err(e) = self.0.changed().await {
-				return Err(e);
-			}
+			self.0.changed().await?;
 
 			if let Some(v) = *(self.0.borrow()) {
 				return Ok(v);