Skip to content

Commit bc074f0

Browse files
committed
Rustfmt
1 parent c92bf36 commit bc074f0

File tree

1 file changed

+42
-42
lines changed
  • crates/uv-resolver/src/resolver

1 file changed

+42
-42
lines changed

crates/uv-resolver/src/resolver/mod.rs

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -336,27 +336,27 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
336336
} else {
337337
// Run unit propagation.
338338
let result = state.pubgrub.unit_propagation(state.next);
339-
match result {
340-
Err(err) => {
341-
// If unit propagation failed, there is no solution.
342-
return Err(self.convert_no_solution_err(
343-
err,
344-
state.fork_urls,
345-
&state.fork_indexes,
346-
state.env,
347-
&visited,
348-
&self.locations,
349-
&self.capabilities,
350-
));
351-
}
352-
Ok(conflicts) => {
353-
for (affected, incompatibility) in conflicts {
354-
// Conflict tracking: If there was a conflict, track affected and
355-
// culprit for all root cause incompatibilities
356-
state.record_conflict(affected, None, incompatibility);
339+
match result {
340+
Err(err) => {
341+
// If unit propagation failed, there is no solution.
342+
return Err(self.convert_no_solution_err(
343+
err,
344+
state.fork_urls,
345+
&state.fork_indexes,
346+
state.env,
347+
&visited,
348+
&self.locations,
349+
&self.capabilities,
350+
));
351+
}
352+
Ok(conflicts) => {
353+
for (affected, incompatibility) in conflicts {
354+
// Conflict tracking: If there was a conflict, track affected and
355+
// culprit for all root cause incompatibilities
356+
state.record_conflict(affected, None, incompatibility);
357+
}
358+
}
357359
}
358-
}
359-
}
360360

361361
// Pre-visit all candidate packages, to allow metadata to be fetched in parallel.
362362
if self.dependency_mode.is_transitive() {
@@ -375,17 +375,17 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
375375

376376
Self::reprioritize_conflicts(&mut state);
377377

378-
trace!(
379-
"assigned packages: {}",
380-
state
381-
.pubgrub
382-
.partial_solution
383-
.extract_solution()
384-
.filter(|(p, _)| !state.pubgrub.package_store[*p].is_proxy())
385-
.map(|(p, v)| format!("{}=={}", state.pubgrub.package_store[p], v))
386-
.join(", ")
387-
);
388-
// Choose a package .
378+
trace!(
379+
"assigned packages: {}",
380+
state
381+
.pubgrub
382+
.partial_solution
383+
.extract_solution()
384+
.filter(|(p, _)| !state.pubgrub.package_store[*p].is_proxy())
385+
.map(|(p, v)| format!("{}=={}", state.pubgrub.package_store[p], v))
386+
.join(", ")
387+
);
388+
// Choose a package .
389389
let Some(highest_priority_pkg) =
390390
state.pubgrub.partial_solution.pick_highest_priority_pkg(
391391
|id, _range| state.priorities.get(&state.pubgrub.package_store[id]),
@@ -431,17 +431,17 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
431431
resolutions.push(resolution);
432432
continue 'FORK;
433433
};
434-
trace!(
435-
"Chose package for decision: {}. remaining choices: {}",
436-
state.pubgrub.package_store[highest_priority_pkg],
437-
state
438-
.pubgrub
439-
.partial_solution
440-
.undecided_packages()
441-
.filter(|(p, _)| !state.pubgrub.package_store[**p].is_proxy())
442-
.map(|(p, _)| state.pubgrub.package_store[*p].to_string())
443-
.join(", ")
444-
);
434+
trace!(
435+
"Chose package for decision: {}. remaining choices: {}",
436+
state.pubgrub.package_store[highest_priority_pkg],
437+
state
438+
.pubgrub
439+
.partial_solution
440+
.undecided_packages()
441+
.filter(|(p, _)| !state.pubgrub.package_store[**p].is_proxy())
442+
.map(|(p, _)| state.pubgrub.package_store[*p].to_string())
443+
.join(", ")
444+
);
445445

446446
highest_priority_pkg
447447
};

0 commit comments

Comments
 (0)