mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 13:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove SolveState to ForkState (#4683)

Browse source 
It's hard to talk about solve state and resolver state, so i'm renaming
them to fork state and resolver state, indicating the hierarchy between
more directly.
This commit is contained in:
konsti 2024-07-01 18:33:50 +02:00 • committed by GitHub
parent 305868cdcc
commit 0ee4a2cc6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/uv-resolver/src/resolver/mod.rs
View file

@ -316,7 +316,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
) -> Result<ResolutionGraph, ResolveError> { ) -> Result<ResolutionGraph, ResolveError> {
let root = PubGrubPackage::from(PubGrubPackageInner::Root(self.project.clone())); let root = PubGrubPackage::from(PubGrubPackageInner::Root(self.project.clone()));
let mut prefetcher = BatchPrefetcher::default(); let mut prefetcher = BatchPrefetcher::default();
let state = SolveState { let state = ForkState {
pubgrub: State::init(root.clone(), MIN_VERSION.clone()), pubgrub: State::init(root.clone(), MIN_VERSION.clone()),
next: root, next: root,
pins: FilePins::default(), pins: FilePins::default(),
@ -1673,7 +1673,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
/// State that is used during unit propagation in the resolver, one instance per fork. /// State that is used during unit propagation in the resolver, one instance per fork.
#[derive(Clone)] #[derive(Clone)]
struct SolveState { struct ForkState {
/// The internal state used by the resolver. /// The internal state used by the resolver.
/// ///
/// Note that not all parts of this state are strictly internal. For /// Note that not all parts of this state are strictly internal. For
@ -1726,7 +1726,7 @@ struct SolveState {
markers: MarkerTree, markers: MarkerTree,
} }
impl SolveState { impl ForkState {
/// Add the dependencies for the selected version of the current package, checking for /// Add the dependencies for the selected version of the current package, checking for
/// self-dependencies, and handling URLs. /// self-dependencies, and handling URLs.
fn add_package_version_dependencies( fn add_package_version_dependencies(