diff --git a/crates/distribution-types/src/lib.rs b/crates/distribution-types/src/lib.rs index 77e978c23..f25354f74 100644 --- a/crates/distribution-types/src/lib.rs +++ b/crates/distribution-types/src/lib.rs @@ -52,7 +52,8 @@ use requirements_txt::EditableRequirement; pub use crate::any::*; pub use crate::cached::*; -pub use crate::editable::LocalEditable; +pub use crate::direct_url::*; +pub use crate::editable::*; pub use crate::error::*; pub use crate::id::*; pub use crate::installed::*; @@ -61,7 +62,7 @@ pub use crate::traits::*; mod any; mod cached; -pub mod direct_url; +mod direct_url; mod editable; mod error; mod id; diff --git a/crates/puffin-distribution/src/distribution_database.rs b/crates/puffin-distribution/src/distribution_database.rs index 3cfeaec83..ee9bd2c62 100644 --- a/crates/puffin-distribution/src/distribution_database.rs +++ b/crates/puffin-distribution/src/distribution_database.rs @@ -13,8 +13,7 @@ use tracing::debug; use url::Url; use distribution_filename::{WheelFilename, WheelFilenameError}; -use distribution_types::direct_url::DirectGitUrl; -use distribution_types::{BuiltDist, Dist, LocalEditable, Name, SourceDist}; +use distribution_types::{BuiltDist, DirectGitUrl, Dist, LocalEditable, Name, SourceDist}; use platform_tags::Tags; use puffin_cache::{digest, Cache, CacheBucket, WheelCache}; use puffin_client::RegistryClient; diff --git a/crates/puffin-distribution/src/source_dist.rs b/crates/puffin-distribution/src/source_dist.rs index 455843486..55d65b9b8 100644 --- a/crates/puffin-distribution/src/source_dist.rs +++ b/crates/puffin-distribution/src/source_dist.rs @@ -20,9 +20,9 @@ use zip::result::ZipError; use zip::ZipArchive; use distribution_filename::{WheelFilename, WheelFilenameError}; -use distribution_types::direct_url::{DirectArchiveUrl, DirectGitUrl}; use distribution_types::{ - Dist, GitSourceDist, LocalEditable, Name, PathSourceDist, RemoteSource, SourceDist, + DirectArchiveUrl, DirectGitUrl, Dist, GitSourceDist, LocalEditable, Name, PathSourceDist, + RemoteSource, SourceDist, }; use install_wheel_rs::read_dist_info; use platform_tags::Tags; diff --git a/crates/puffin-installer/src/plan.rs b/crates/puffin-installer/src/plan.rs index eab220058..fa74ecc38 100644 --- a/crates/puffin-installer/src/plan.rs +++ b/crates/puffin-installer/src/plan.rs @@ -4,9 +4,10 @@ use anyhow::{bail, Result}; use rustc_hash::FxHashSet; use tracing::{debug, warn}; -use distribution_types::direct_url::git_reference; -use distribution_types::{BuiltDist, Dist, Name, SourceDist}; -use distribution_types::{CachedDirectUrlDist, CachedDist, InstalledDist}; +use distribution_types::{ + git_reference, BuiltDist, CachedDirectUrlDist, CachedDist, Dist, InstalledDist, Name, + SourceDist, +}; use pep508_rs::{Requirement, VersionOrUrl}; use platform_tags::Tags; use puffin_cache::{Cache, CacheBucket, WheelCache}; diff --git a/crates/pypi-types/src/lib.rs b/crates/pypi-types/src/lib.rs index 424de3b68..19ed86143 100644 --- a/crates/pypi-types/src/lib.rs +++ b/crates/pypi-types/src/lib.rs @@ -1,8 +1,8 @@ -pub use direct_url::{ArchiveInfo, DirInfo, DirectUrl, VcsInfo, VcsKind}; -pub use index_url::{IndexUrl, IndexUrls}; -pub use lenient_requirement::LenientVersionSpecifiers; -pub use metadata::{Error, Metadata21}; -pub use simple_json::{DistInfoMetadata, File, Hashes, SimpleJson, Yanked}; +pub use direct_url::*; +pub use index_url::*; +pub use lenient_requirement::*; +pub use metadata::*; +pub use simple_json::*; mod direct_url; mod index_url;