mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-02 21:02:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove duplicated lockfile invalidation logs (#6340)

Browse source 
## Summary

These got moved to the caller, so they're all duplicated right now.
This commit is contained in:
Charlie Marsh 2024-08-21 11:29:33 -04:00 • committed by GitHub
parent d627dea51e
commit c485727e00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/uv-resolver/src/lock.rs
View file

@ -10,7 +10,6 @@ use itertools::Itertools;
use petgraph::visit::EdgeRef; use petgraph::visit::EdgeRef;
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use toml_edit::{value, Array, ArrayOfTables, InlineTable, Item, Table, Value}; use toml_edit::{value, Array, ArrayOfTables, InlineTable, Item, Table, Value};
use tracing::debug;
use url::Url; use url::Url;
use cache_key::RepositoryUrl; use cache_key::RepositoryUrl;
@ -695,10 +694,6 @@ impl Lock {
let expected = members.iter().cloned().collect::<BTreeSet<_>>(); let expected = members.iter().cloned().collect::<BTreeSet<_>>();
let actual = &self.manifest.members; let actual = &self.manifest.members;
if expected != *actual { if expected != *actual {
debug!(
"Mismatched members:\n expected: {:?}\n found: {:?}",
expected, actual
);
return Ok(SatisfiesResult::MismatchedMembers(expected, actual)); return Ok(SatisfiesResult::MismatchedMembers(expected, actual));
} }
} }
@ -718,10 +713,6 @@ impl Lock {
.map(|requirement| normalize_requirement(requirement, workspace)) .map(|requirement| normalize_requirement(requirement, workspace))
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
if expected != actual { if expected != actual {
debug!(
"Mismatched requirements:\n expected: {:?}\n found: {:?}",
expected, actual
);
return Ok(SatisfiesResult::MismatchedConstraints(expected, actual)); return Ok(SatisfiesResult::MismatchedConstraints(expected, actual));
} }
} }
@ -741,10 +732,6 @@ impl Lock {
.map(|requirement| normalize_requirement(requirement, workspace)) .map(|requirement| normalize_requirement(requirement, workspace))
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
if expected != actual { if expected != actual {
debug!(
"Mismatched constraints:\n expected: {:?}\n found: {:?}",
expected, actual
);
return Ok(SatisfiesResult::MismatchedConstraints(expected, actual)); return Ok(SatisfiesResult::MismatchedConstraints(expected, actual));
} }
} }
@ -764,10 +751,6 @@ impl Lock {
.map(|requirement| normalize_requirement(requirement, workspace)) .map(|requirement| normalize_requirement(requirement, workspace))
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
if expected != actual { if expected != actual {
debug!(
"Mismatched overrides:\n expected: {:?}\n found: {:?}",
expected, actual
);
return Ok(SatisfiesResult::MismatchedOverrides(expected, actual)); return Ok(SatisfiesResult::MismatchedOverrides(expected, actual));
} }
} }
@ -790,7 +773,6 @@ impl Lock {
let Some(root) = root else { let Some(root) = root else {
// The package is not in the lockfile, so it can't be satisfied. // The package is not in the lockfile, so it can't be satisfied.
debug!("Workspace package `{root_name}` not found in lockfile");
return Ok(SatisfiesResult::MissingRoot(root_name.clone())); return Ok(SatisfiesResult::MissingRoot(root_name.clone()));
}; };
@ -825,7 +807,6 @@ impl Lock {
.get_or_build_wheel_metadata(&dist, HashPolicy::None) .get_or_build_wheel_metadata(&dist, HashPolicy::None)
.await .await
else { else {
debug!("Failed to get metadata for: {}", package.id);
return Ok(SatisfiesResult::MissingMetadata( return Ok(SatisfiesResult::MissingMetadata(
&package.id.name, &package.id.name,
&package.id.version, &package.id.version,
@ -849,10 +830,6 @@ impl Lock {
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
if expected != actual { if expected != actual {
debug!(
"Mismatched `requires-dist` for {}:\n expected: {:?}\n found: {:?}",
package.id, expected, actual
);
return Ok(SatisfiesResult::MismatchedRequiresDist( return Ok(SatisfiesResult::MismatchedRequiresDist(
&package.id.name, &package.id.name,
&package.id.version, &package.id.version,
@ -895,10 +872,6 @@ impl Lock {
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
if expected != actual { if expected != actual {
debug!(
"Mismatched `requires-dev` for {}:\n expected: {:?}\n found: {:?}",
package.id, expected, actual
);
return Ok(SatisfiesResult::MismatchedDevDependencies( return Ok(SatisfiesResult::MismatchedDevDependencies(
&package.id.name, &package.id.name,
&package.id.version, &package.id.version,