mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid returning Some for narrowing no-ops (#10705)

Browse source 
The net effect here is (I think) just that we end up logging more
"narrowing" outcomes than we have in practice.
This commit is contained in:
Charlie Marsh 2025-01-17 11:41:17 -05:00 • committed by GitHub
parent bc8002e26e
commit 8111650100
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/uv-resolver/src/python_requirement.rs
View file

@ -100,6 +100,8 @@ impl PythonRequirement {
/// Narrow the [`PythonRequirement`] to the given version, if it's stricter (i.e., greater)
/// than the current `Requires-Python` minimum.
///
/// Returns `None` if the given range is not narrower than the current range.
pub fn narrow(&self, target: &RequiresPythonRange) -> Option<Self> {
Some(Self {
exact: self.exact.clone(),

5
crates/uv-resolver/src/requires_python.rs
View file

@ -115,7 +115,12 @@ impl RequiresPython {
}
/// Narrow the [`RequiresPython`] by computing the intersection with the given range.
///
/// Returns `None` if the given range is not narrower than the current range.
pub fn narrow(&self, range: &RequiresPythonRange) -> Option<Self> {
if *range == self.range {
return None;
}
let lower = if range.0 >= self.range.0 {
Some(&range.0)
} else {

9
crates/uv-resolver/src/resolver/environment.rs
View file

@ -690,17 +690,14 @@ mod tests {
}
/// Inside a fork whose marker's Python requirement is equal
/// to our Requires-Python means that narrowing produces a
/// result, but is unchanged from what we started with.
/// to our Requires-Python means that narrowing does not produce
/// a result.
#[test]
fn narrow_python_requirement_forking_no_op() {
let pyreq = python_requirement("3.10");
let resolver_env = ResolverEnvironment::universal(vec![])
.narrow_environment(marker("python_version >= '3.10'"));
assert_eq!(
resolver_env.narrow_python_requirement(&pyreq),
Some(python_requirement("3.10")),
);
assert_eq!(resolver_env.narrow_python_requirement(&pyreq), None);
}
/// In this test, we narrow a more relaxed requirement compared to the