mirror of
https://github.com/astral-sh/uv
synced 2026-06-21 13:47:25 +00:00
Fix remaining nightly clippy lints (#19881)
Co-authored-by: Zanie Blue <contact@zanie.dev>
This commit is contained in:
@@ -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:?}"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
)?;
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ pub(crate) async fn resolve<InstalledPackages: InstalledPackagesProvider>(
|
||||
// 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()
|
||||
))?;
|
||||
|
||||
@@ -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));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user