Skip to content

Add symmetrical expressions to mutual incompatibilities #9945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
charliermarsh wants to merge 1 commit into from
Closed

Add symmetrical expressions to mutual incompatibilities #9945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 52 additions & 0 deletions crates/uv-pep508/src/marker/algebra.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,58 @@ impl InternerGuard<'_> {
let a_and_b = conjunction(self, a, b);
tree = disjunction(self, tree, a_and_b);
}

// These are markers that must have the same value (i.e., they must both be true or both be
// false).
for (a, b) in [
// sys_platform == 'win32' and platform_system == 'Windows'
(
MarkerExpression::String {
key: MarkerValueString::SysPlatform,
operator: MarkerOperator::Equal,
value: "win32".to_string(),
},
MarkerExpression::String {
key: MarkerValueString::PlatformSystem,
operator: MarkerOperator::Equal,
value: "Windows".to_string(),
},
),
// sys_platform == 'darwin' and platform_system == 'Darwin'
(
MarkerExpression::String {
key: MarkerValueString::SysPlatform,
operator: MarkerOperator::Equal,
value: "darwin".to_string(),
},
MarkerExpression::String {
key: MarkerValueString::PlatformSystem,
operator: MarkerOperator::Equal,
value: "Darwin".to_string(),
},
),
// sys_platform == 'linux' and platform_system == 'Linux'
(
MarkerExpression::String {
key: MarkerValueString::SysPlatform,
operator: MarkerOperator::Equal,
value: "linux".to_string(),
},
MarkerExpression::String {
key: MarkerValueString::PlatformSystem,
operator: MarkerOperator::Equal,
value: "Linux".to_string(),
},
),
] {
let a = self.expression(a);
let b = self.expression(b);
let a_and_not_b = conjunction(self, a, b.not());
let not_a_and_b = conjunction(self, a.not(), b);
tree = disjunction(self, tree, a_and_not_b);
tree = disjunction(self, tree, not_a_and_b);
}

self.state.exclusions = Some(tree);
tree
}
Expand Down