Skip to content

Commit ed14321

Browse files
committed
run fmt
1 parent 057989b commit ed14321

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

src/solver/mod.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ impl<D: DependencyProvider, RT: AsyncRuntime> Solver<D, RT> {
814814
clauses.iter().map(|(r, c)| (*r, *c)).collect::<Vec<_>>(),
815815
)
816816
});
817-
817+
818818
for (solvable_id, condition, requirements) in requires_iter.chain(conditional_iter) {
819819
let is_explicit_requirement = solvable_id == VariableId::root();
820820

@@ -835,7 +835,10 @@ impl<D: DependencyProvider, RT: AsyncRuntime> Solver<D, RT> {
835835
if let Some(condition) = condition {
836836
tracing::trace!("condition o kir: {:?}", condition);
837837
let condition_requirement: Requirement = condition.into();
838-
let conditional_candidates = match self.requirement_to_sorted_candidates.get(&condition_requirement) {
838+
let conditional_candidates = match self
839+
.requirement_to_sorted_candidates
840+
.get(&condition_requirement)
841+
{
839842
Some(candidates) => candidates,
840843
None => continue,
841844
};

tests/solver.rs

+17-14
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,10 @@ impl BundleBoxProvider {
217217
.expect("package missing")
218218
}
219219

220-
pub fn requirements<R: From<(VersionSetId, Option<VersionSetId>)>>(&self, requirements: &[&str]) -> Vec<R> {
220+
pub fn requirements<R: From<(VersionSetId, Option<VersionSetId>)>>(
221+
&self,
222+
requirements: &[&str],
223+
) -> Vec<R> {
221224
requirements
222225
.iter()
223226
.map(|dep| Spec::from_str(dep).unwrap())
@@ -1512,8 +1515,8 @@ fn test_conditional_requirements_not_met() {
15121515

15131516
// Create conditional requirement: if b=1 is installed, require c
15141517
let requirements = provider.requirements(&[
1515-
"a", // Require package a
1516-
"c 1; if b 1" // If b=1 is installed, require c (note the exact version)
1518+
"a", // Require package a
1519+
"c 1; if b 1", // If b=1 is installed, require c (note the exact version)
15171520
]);
15181521

15191522
let mut solver = Solver::new(provider);
@@ -1539,10 +1542,10 @@ fn test_nested_conditional_dependencies() {
15391542

15401543
// Create nested conditional requirements using the parser
15411544
let requirements = provider.requirements(&[
1542-
"a", // Require package a
1543-
"b 1; if a 1", // If a is installed, require b
1544-
"c 1; if b 1", // If b is installed, require c
1545-
"d 1; if c 1" // If c is installed, require d
1545+
"a", // Require package a
1546+
"b 1; if a 1", // If a is installed, require b
1547+
"c 1; if b 1", // If b is installed, require c
1548+
"d 1; if c 1", // If c is installed, require d
15461549
]);
15471550

15481551
let mut solver = Solver::new(provider);
@@ -1570,10 +1573,10 @@ fn test_multiple_conditions_same_package() {
15701573

15711574
// Create multiple conditions that all require the same package using the parser
15721575
let requirements = provider.requirements(&[
1573-
"b", // Only require package b
1574-
"target 1; if a 1", // If a is installed, require target
1575-
"target 1; if b 1", // If b is installed, require target
1576-
"target 1; if c 1" // If c is installed, require target
1576+
"b", // Only require package b
1577+
"target 1; if a 1", // If a is installed, require target
1578+
"target 1; if b 1", // If b is installed, require target
1579+
"target 1; if c 1", // If c is installed, require target
15771580
]);
15781581

15791582
let mut solver = Solver::new(provider);
@@ -1597,9 +1600,9 @@ fn test_circular_conditional_dependencies() {
15971600

15981601
// Create circular conditional dependencies using the parser
15991602
let requirements = provider.requirements(&[
1600-
"a", // Require package a
1601-
"b 1; if a 1", // If a is installed, require b
1602-
"a 1; if b 1" // If b is installed, require a
1603+
"a", // Require package a
1604+
"b 1; if a 1", // If a is installed, require b
1605+
"a 1; if b 1", // If b is installed, require a
16031606
]);
16041607

16051608
let mut solver = Solver::new(provider);

0 commit comments

Comments
 (0)