Clippy fixes from rust 1.91 nightly (#1267)

This commit is contained in:
Ehren Bendler
2025-08-13 11:01:25 -04:00
committed by GitHub
parent 9472aaca7a
commit a033152c60
3 changed files with 3 additions and 3 deletions

View File

@@ -90,7 +90,7 @@ impl<'a> Runner<'a> {
Ok(()) Ok(())
} }
pub fn report(&self) -> &Report { pub fn report(&self) -> &Report<'_> {
&self.report &self.report
} }
} }

View File

@@ -896,7 +896,7 @@ pub fn run_composer_update(ctx: &ExecutionContext) -> Result<()> {
let composer_home = Command::new(&composer) let composer_home = Command::new(&composer)
.args(["global", "config", "--absolute", "--quiet", "home"]) .args(["global", "config", "--absolute", "--quiet", "home"])
.output_checked_utf8() .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()))? .map(|s| PathBuf::from(s.stdout.trim()))?
.require()?; .require()?;

View File

@@ -179,7 +179,7 @@ pub mod merge_strategies {
if let Some(left_vec) = left { if let Some(left_vec) = left {
if let Some(mut right_vec) = right { if let Some(mut right_vec) = right {
right_vec.append(left_vec); right_vec.append(left_vec);
let _ = std::mem::replace(left, Some(right_vec)); let _ = left.replace(right_vec);
} }
} else { } else {
*left = right; *left = right;