diff --git a/src/runner.rs b/src/runner.rs index 730b62dd..998aaece 100644 --- a/src/runner.rs +++ b/src/runner.rs @@ -90,7 +90,7 @@ impl<'a> Runner<'a> { Ok(()) } - pub fn report(&self) -> &Report { + pub fn report(&self) -> &Report<'_> { &self.report } } diff --git a/src/steps/generic.rs b/src/steps/generic.rs index b41f428d..ad42e70b 100644 --- a/src/steps/generic.rs +++ b/src/steps/generic.rs @@ -896,7 +896,7 @@ pub fn run_composer_update(ctx: &ExecutionContext) -> Result<()> { let composer_home = Command::new(&composer) .args(["global", "config", "--absolute", "--quiet", "home"]) .output_checked_utf8() - .map_err(|e| (SkipStep(t!("Error getting the composer directory: {error}", error = e).to_string()))) + .map_err(|e| SkipStep(t!("Error getting the composer directory: {error}", error = e).to_string())) .map(|s| PathBuf::from(s.stdout.trim()))? .require()?; diff --git a/src/utils.rs b/src/utils.rs index 20bdaf99..4e2252a2 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -179,7 +179,7 @@ pub mod merge_strategies { if let Some(left_vec) = left { if let Some(mut right_vec) = right { right_vec.append(left_vec); - let _ = std::mem::replace(left, Some(right_vec)); + let _ = left.replace(right_vec); } } else { *left = right;