diff --git a/crates/uv-resolver/src/error.rs b/crates/uv-resolver/src/error.rs index f384492c4e..eee9f5650d 100644 --- a/crates/uv-resolver/src/error.rs +++ b/crates/uv-resolver/src/error.rs @@ -1137,10 +1137,9 @@ fn merge_unavailable_versions( let (unchanged_cause, merged_versions, merged_is_cause2) = if let Some(merged_versions) = merge(&derived.cause2) { (derived.cause1.clone(), merged_versions, true) - } else if let Some(merged_versions) = merge(&derived.cause1) { - (derived.cause2.clone(), merged_versions, false) } else { - return None; + let merged_versions = merge(&derived.cause1)?; + (derived.cause2.clone(), merged_versions, false) }; let merged_cause = Arc::new(DerivationTree::External(External::Custom( @@ -1746,6 +1745,7 @@ mod tests { cause2: Arc::new(leaf), })); - assert_eq!(format!("{:?}", &*tree), format!("{tree:?}")); + let inner = &*tree; + assert_eq!(format!("{inner:?}"), format!("{tree:?}")); } } diff --git a/crates/uv-resolver/src/pubgrub/report.rs b/crates/uv-resolver/src/pubgrub/report.rs index c367e46cee..e824b3d435 100644 --- a/crates/uv-resolver/src/pubgrub/report.rs +++ b/crates/uv-resolver/src/pubgrub/report.rs @@ -698,7 +698,7 @@ impl PubGrubReportFormatter<'_> { let external1 = self.format_external(external1); let external2 = self.format_external(external2); - format!("{}and {}", padded("", &external1, " "), &external2) + format!("{}and {}", padded("", &external1, " "), external2) } } } diff --git a/crates/uv/src/commands/pip/loggers.rs b/crates/uv/src/commands/pip/loggers.rs index cd141d8b9f..fd7b02c83b 100644 --- a/crates/uv/src/commands/pip/loggers.rs +++ b/crates/uv/src/commands/pip/loggers.rs @@ -398,7 +398,7 @@ impl InstallLogger for UpgradeInstallLogger { printer.stderr(), "{} {} {}", "Reinstalled".yellow().bold(), - &self.target, + self.target, reinstalls )?; } else { @@ -416,7 +416,7 @@ impl InstallLogger for UpgradeInstallLogger { printer.stderr(), "{} {} {} -> {}", "Updated".green().bold(), - &self.target, + self.target, removals, additions )?; @@ -432,7 +432,7 @@ impl InstallLogger for UpgradeInstallLogger { printer.stderr(), "{} {} {}", "Removed".red().bold(), - &self.target, + self.target, removals )?; } @@ -446,7 +446,7 @@ impl InstallLogger for UpgradeInstallLogger { printer.stderr(), "{} {} {}", "Added".green().bold(), - &self.target, + self.target, additions )?; } @@ -455,7 +455,7 @@ impl InstallLogger for UpgradeInstallLogger { printer.stderr(), "{} {} {}", "Modified".dimmed(), - &self.target.dimmed().bold(), + self.target.dimmed().bold(), "environment".dimmed() )?; } diff --git a/crates/uv/src/commands/pip/operations.rs b/crates/uv/src/commands/pip/operations.rs index 814d80eda3..061b60c645 100644 --- a/crates/uv/src/commands/pip/operations.rs +++ b/crates/uv/src/commands/pip/operations.rs @@ -234,7 +234,7 @@ pub(crate) async fn resolve( // Complain if dependency groups are named that don't appear. for name in groups.explicit_names() { if !metadata.dependency_groups.contains_key(name) { - return Err(anyhow!( + Err(anyhow!( "The dependency group '{name}' was not found in the project: {}", pyproject_path.user_display() ))?; diff --git a/crates/uv/tests/pip_install/pip_install.rs b/crates/uv/tests/pip_install/pip_install.rs index 158e2fc893..e65aa268a5 100644 --- a/crates/uv/tests/pip_install/pip_install.rs +++ b/crates/uv/tests/pip_install/pip_install.rs @@ -777,7 +777,7 @@ async fn install_remote_requirements_txt() -> Result<()> { let server_url = start_requirements_server(username, password, requirements_txt).await; - let mut requirements_url = Url::parse(&format!("{}/requirements.txt", &server_url))?; + let mut requirements_url = Url::parse(&format!("{server_url}/requirements.txt"))?; // Should fail without credentials uv_snapshot!(context.filters(), context.pip_install() @@ -824,7 +824,7 @@ async fn install_remote_requirements_txt() -> Result<()> { let requirements_txt = "iniconfig"; // Update the mock server to serve a new requirements.txt let server_url = start_requirements_server(username, password, requirements_txt).await; - let mut requirements_url = Url::parse(&format!("{}/requirements.txt", &server_url))?; + let mut requirements_url = Url::parse(&format!("{server_url}/requirements.txt"))?; let _ = requirements_url.set_username(username); let _ = requirements_url.set_password(Some(password));