Rename from Lowered to Canonical (#9447)

By request:
https://github.com/astral-sh/uv/pull/9341#pullrequestreview-2460979421.
This commit is contained in:
Charlie Marsh
2024-11-26 13:34:43 -05:00
committed by GitHub
parent 7a0a5a806d
commit 8aeaf98f59
8 changed files with 78 additions and 76 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
use pubgrub::Range;
use uv_pep440::Version;
use uv_pep508::{LoweredMarkerValueVersion, MarkerTree, MarkerTreeKind};
use uv_pep508::{CanonicalMarkerValueVersion, MarkerTree, MarkerTreeKind};
use crate::requires_python::{LowerBound, RequiresPythonRange, UpperBound};
@@ -10,14 +10,14 @@ pub(crate) fn requires_python(tree: &MarkerTree) -> Option<RequiresPythonRange>
match tree.kind() {
MarkerTreeKind::True | MarkerTreeKind::False => {}
MarkerTreeKind::Version(marker) => match marker.key() {
LoweredMarkerValueVersion::PythonFullVersion => {
CanonicalMarkerValueVersion::PythonFullVersion => {
for (range, tree) in marker.edges() {
if !tree.is_false() {
markers.push(range.clone());
}
}
}
LoweredMarkerValueVersion::ImplementationVersion => {
CanonicalMarkerValueVersion::ImplementationVersion => {
for (_, tree) in marker.edges() {
collect_python_markers(&tree, markers);
}
+4 -4
View File
@@ -587,8 +587,8 @@ impl ResolverOutput {
marker_env: &MarkerEnvironment,
) -> Result<MarkerTree, Box<ParsedUrlError>> {
use uv_pep508::{
LoweredMarkerValueString, LoweredMarkerValueVersion, MarkerExpression, MarkerOperator,
MarkerTree,
CanonicalMarkerValueString, CanonicalMarkerValueVersion, MarkerExpression,
MarkerOperator, MarkerTree,
};
/// A subset of the possible marker values.
@@ -598,8 +598,8 @@ impl ResolverOutput {
/// values based on the current marker environment.
#[derive(Debug, Eq, Hash, PartialEq)]
enum MarkerParam {
Version(LoweredMarkerValueVersion),
String(LoweredMarkerValueString),
Version(CanonicalMarkerValueVersion),
String(CanonicalMarkerValueString),
}
/// Add all marker parameters from the given tree to the given set.