diff --git a/crates/puffin-cli/src/commands/pip_sync.rs b/crates/puffin-cli/src/commands/pip_sync.rs index ddd3562b0..1ce88f916 100644 --- a/crates/puffin-cli/src/commands/pip_sync.rs +++ b/crates/puffin-cli/src/commands/pip_sync.rs @@ -14,7 +14,7 @@ use platform_tags::Tags; use puffin_client::RegistryClientBuilder; use puffin_dispatch::BuildDispatch; use puffin_distribution::Distribution; -use puffin_installer::{Builder, PartitionedRequirements}; +use puffin_installer::{Builder, InstallPlan}; use puffin_interpreter::Virtualenv; use crate::commands::reporters::{ @@ -69,11 +69,11 @@ pub(crate) async fn sync_requirements( // Partition into those that should be linked from the cache (`local`), those that need to be // downloaded (`remote`), and those that should be removed (`extraneous`). - let PartitionedRequirements { + let InstallPlan { local, remote, extraneous, - } = PartitionedRequirements::try_from_requirements(requirements, cache, &venv)?; + } = InstallPlan::try_from_requirements(requirements, cache, &venv)?; // Nothing to do. if remote.is_empty() && local.is_empty() && extraneous.is_empty() { diff --git a/crates/puffin-dispatch/src/lib.rs b/crates/puffin-dispatch/src/lib.rs index 2f7aa70f3..5a7352bf7 100644 --- a/crates/puffin-dispatch/src/lib.rs +++ b/crates/puffin-dispatch/src/lib.rs @@ -15,7 +15,7 @@ use pep508_rs::Requirement; use platform_tags::Tags; use puffin_build::{SourceDistributionBuild, SourceDistributionBuildContext}; use puffin_client::RegistryClient; -use puffin_installer::{Builder, Downloader, Installer, PartitionedRequirements, Unzipper}; +use puffin_installer::{Builder, Downloader, InstallPlan, Installer, Unzipper}; use puffin_interpreter::{InterpreterInfo, Virtualenv}; use puffin_resolver::{DistributionFinder, Manifest, PreReleaseMode, ResolutionMode, Resolver}; use puffin_traits::BuildContext; @@ -104,11 +104,11 @@ impl BuildContext for BuildDispatch { venv.root().display(), ); - let PartitionedRequirements { + let InstallPlan { local, remote, extraneous, - } = PartitionedRequirements::try_from_requirements(requirements, &self.cache, venv)?; + } = InstallPlan::try_from_requirements(requirements, &self.cache, venv)?; let tags = Tags::from_env( self.interpreter_info.platform(), diff --git a/crates/puffin-installer/src/lib.rs b/crates/puffin-installer/src/lib.rs index 969ca5374..40e07fcdd 100644 --- a/crates/puffin-installer/src/lib.rs +++ b/crates/puffin-installer/src/lib.rs @@ -1,7 +1,7 @@ pub use builder::{Builder, Reporter as BuildReporter}; pub use downloader::{Download, Downloader, Reporter as DownloadReporter}; pub use installer::{Installer, Reporter as InstallReporter}; -pub use plan::PartitionedRequirements; +pub use plan::InstallPlan; pub use registry_index::RegistryIndex; pub use site_packages::SitePackages; pub use uninstall::uninstall; diff --git a/crates/puffin-installer/src/plan.rs b/crates/puffin-installer/src/plan.rs index 63acb3f3a..ac6901ce2 100644 --- a/crates/puffin-installer/src/plan.rs +++ b/crates/puffin-installer/src/plan.rs @@ -11,7 +11,7 @@ use crate::url_index::UrlIndex; use crate::{RegistryIndex, SitePackages}; #[derive(Debug, Default)] -pub struct PartitionedRequirements { +pub struct InstallPlan { /// The distributions that are not already installed in the current environment, but are /// available in the local cache. pub local: Vec, @@ -25,7 +25,7 @@ pub struct PartitionedRequirements { pub extraneous: Vec, } -impl PartitionedRequirements { +impl InstallPlan { /// Partition a set of requirements into those that should be linked from the cache, those that /// need to be downloaded, and those that should be removed. pub fn try_from_requirements( @@ -93,7 +93,7 @@ impl PartitionedRequirements { extraneous.push(dist_info); } - Ok(PartitionedRequirements { + Ok(InstallPlan { local, remote, extraneous,