Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Store marker range edges outside decision nodes
  • Loading branch information
charliermarsh committed Oct 19, 2026
commit a43f97e6a84b75c7256c76dcee366d9dcebd0ce4
29 changes: 16 additions & 13 deletions crates/uv-pep508/src/marker/algebra.rs
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ impl InternerGuard<'_> {
let clipped = Ranges::from_range_bounds((last_lower.cloned(), Bound::Unbounded));
*new.last_mut().unwrap() = (clipped, last_node_id);

let new = new.into_boxed_slice();
self.create_node(node.var.clone(), Edges::Version { edges: new })
.negate(i)
}
Expand Down Expand Up @@ -1439,6 +1440,8 @@ impl NodeId {
type SmallVec<T> = smallvec::SmallVec<[T; 5]>;

/// The edges of a decision node.
///
/// Range payloads are stored separately so Boolean nodes do not reserve space for range edges.
#[derive(PartialEq, Eq, Hash, Clone, Debug)]
pub(crate) enum Edges {
// The edges of a version variable, representing a disjoint set of ranges that cover
Expand All @@ -1447,15 +1450,15 @@ pub(crate) enum Edges {
// Invariant: All ranges are simple, meaning they can be represented by a bounded
// interval without gaps. Additionally, there are at least two edges in the set.
Version {
edges: SmallVec<(Ranges<Version>, NodeId)>,
edges: Box<[(Ranges<Version>, NodeId)]>,
},
// The edges of a string variable, representing a disjoint set of ranges that cover
// the output space.
//
// Invariant: All ranges are simple, meaning they can be represented by a bounded
// interval without gaps. Additionally, there are at least two edges in the set.
String {
edges: SmallVec<(Ranges<ArcStr>, NodeId)>,
edges: Box<[(Ranges<ArcStr>, NodeId)]>,
},
// The edges of a boolean variable, representing the values `true` (the `high` child)
// and `false` (the `low` child).
Expand Down Expand Up @@ -1585,7 +1588,7 @@ impl Edges {
}

/// Returns an [`Edges`] where values in the given range are `true`.
fn from_range<T>(range: &Ranges<T>) -> SmallVec<(Ranges<T>, NodeId)>
fn from_range<T>(range: &Ranges<T>) -> Box<[(Ranges<T>, NodeId)]>
where
T: Ord + Clone,
{
Expand All @@ -1607,7 +1610,7 @@ impl Edges {
//
// The ranges are disjoint so we don't care about equality.
edges.sort_by(|(range1, _), (range2, _)| compare_disjoint_range_start(range1, range2));
edges
edges.into_boxed_slice()
}

/// Merge two [`Edges`], applying the given operation (e.g., `AND` or `OR`) to all intersecting edges.
Expand Down Expand Up @@ -1679,12 +1682,12 @@ impl Edges {
/// In that case, we drop any ranges that do not exist in the domain of both edges. Note that
/// this should not occur in practice because `requires-python` bounds are global.
fn apply_ranges<T>(
left_edges: &SmallVec<(Ranges<T>, NodeId)>,
left_edges: &[(Ranges<T>, NodeId)],
left_parent: NodeId,
right_edges: &SmallVec<(Ranges<T>, NodeId)>,
right_edges: &[(Ranges<T>, NodeId)],
right_parent: NodeId,
mut apply: impl FnMut(NodeId, NodeId) -> NodeId,
) -> SmallVec<(Ranges<T>, NodeId)>
) -> Box<[(Ranges<T>, NodeId)]>
where
T: Clone + Ord,
{
Expand Down Expand Up @@ -1720,7 +1723,7 @@ impl Edges {
}
}

combined
combined.into_boxed_slice()
}

// Returns `true` if two [`Edges`] are disjoint.
Expand Down Expand Up @@ -1756,9 +1759,9 @@ impl Edges {

// Returns `true` if all intersecting ranges in two range maps are disjoint.
fn is_disjoint_ranges<T>(
left_edges: &SmallVec<(Ranges<T>, NodeId)>,
left_edges: &[(Ranges<T>, NodeId)],
left_parent: NodeId,
right_edges: &SmallVec<(Ranges<T>, NodeId)>,
right_edges: &[(Ranges<T>, NodeId)],
right_parent: NodeId,
interner: &mut InternerGuard<'_>,
) -> bool
Expand Down Expand Up @@ -1805,10 +1808,10 @@ impl Edges {
/// Maps the children and coalesces adjacent ranges that now share a child.
/// This keeps equivalent decisions identical when we intern the resulting node.
fn map_ranges<T>(
edges: &SmallVec<(Ranges<T>, NodeId)>,
edges: &[(Ranges<T>, NodeId)],
parent: NodeId,
mut map: impl FnMut(NodeId) -> NodeId,
) -> SmallVec<(Ranges<T>, NodeId)>
) -> Box<[(Ranges<T>, NodeId)]>
where
T: Clone + Ord,
{
Expand All @@ -1824,7 +1827,7 @@ impl Edges {
mapped.push((range.clone(), child));
}
}
mapped
mapped.into_boxed_slice()
}

/// Returns an iterator over all direct children of this node.
Expand Down
10 changes: 5 additions & 5 deletions crates/uv-pep508/src/marker/algebra/isop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,14 @@ impl InternerGuard<'_> {
let lower_edges = if let Edges::Version { edges } = &lower_node.children
&& lower_node.var == *variable
{
Some(edges.as_slice())
Some(edges.as_ref())
} else {
None
};
let upper_edges = if let Edges::Version { edges } = &upper_node.children
&& upper_node.var == *variable
{
Some(edges.as_slice())
Some(edges.as_ref())
} else {
None
};
Expand All @@ -239,14 +239,14 @@ impl InternerGuard<'_> {
let lower_edges = if let Edges::String { edges } = &lower_node.children
&& lower_node.var == *variable
{
Some(edges.as_slice())
Some(edges.as_ref())
} else {
None
};
let upper_edges = if let Edges::String { edges } = &upper_node.children
&& upper_node.var == *variable
{
Some(edges.as_slice())
Some(edges.as_ref())
} else {
None
};
Expand Down Expand Up @@ -275,7 +275,7 @@ fn guard_edges<T: Clone + Ord>(
edges: &[(Ranges<T>, NodeId)],
parent: NodeId,
child: NodeId,
) -> SmallVec<(Ranges<T>, NodeId)> {
) -> Box<[(Ranges<T>, NodeId)]> {
let range = edges
.iter()
.filter(|(_, candidate)| candidate.negate(parent) == child)
Expand Down
⌂ 换网址