Modify some inconsistent exports (#724)

This commit is contained in:
Charlie Marsh 2023-12-24 17:30:03 -05:00 committed by GitHub
parent 343880820b
commit ad34bb02a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 14 deletions

View file

@ -52,7 +52,8 @@ use requirements_txt::EditableRequirement;
pub use crate::any::*; pub use crate::any::*;
pub use crate::cached::*; 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::error::*;
pub use crate::id::*; pub use crate::id::*;
pub use crate::installed::*; pub use crate::installed::*;
@ -61,7 +62,7 @@ pub use crate::traits::*;
mod any; mod any;
mod cached; mod cached;
pub mod direct_url; mod direct_url;
mod editable; mod editable;
mod error; mod error;
mod id; mod id;

View file

@ -13,8 +13,7 @@ use tracing::debug;
use url::Url; use url::Url;
use distribution_filename::{WheelFilename, WheelFilenameError}; use distribution_filename::{WheelFilename, WheelFilenameError};
use distribution_types::direct_url::DirectGitUrl; use distribution_types::{BuiltDist, DirectGitUrl, Dist, LocalEditable, Name, SourceDist};
use distribution_types::{BuiltDist, Dist, LocalEditable, Name, SourceDist};
use platform_tags::Tags; use platform_tags::Tags;
use puffin_cache::{digest, Cache, CacheBucket, WheelCache}; use puffin_cache::{digest, Cache, CacheBucket, WheelCache};
use puffin_client::RegistryClient; use puffin_client::RegistryClient;

View file

@ -20,9 +20,9 @@ use zip::result::ZipError;
use zip::ZipArchive; use zip::ZipArchive;
use distribution_filename::{WheelFilename, WheelFilenameError}; use distribution_filename::{WheelFilename, WheelFilenameError};
use distribution_types::direct_url::{DirectArchiveUrl, DirectGitUrl};
use distribution_types::{ 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 install_wheel_rs::read_dist_info;
use platform_tags::Tags; use platform_tags::Tags;

View file

@ -4,9 +4,10 @@ use anyhow::{bail, Result};
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use tracing::{debug, warn}; use tracing::{debug, warn};
use distribution_types::direct_url::git_reference; use distribution_types::{
use distribution_types::{BuiltDist, Dist, Name, SourceDist}; git_reference, BuiltDist, CachedDirectUrlDist, CachedDist, Dist, InstalledDist, Name,
use distribution_types::{CachedDirectUrlDist, CachedDist, InstalledDist}; SourceDist,
};
use pep508_rs::{Requirement, VersionOrUrl}; use pep508_rs::{Requirement, VersionOrUrl};
use platform_tags::Tags; use platform_tags::Tags;
use puffin_cache::{Cache, CacheBucket, WheelCache}; use puffin_cache::{Cache, CacheBucket, WheelCache};

View file

@ -1,8 +1,8 @@
pub use direct_url::{ArchiveInfo, DirInfo, DirectUrl, VcsInfo, VcsKind}; pub use direct_url::*;
pub use index_url::{IndexUrl, IndexUrls}; pub use index_url::*;
pub use lenient_requirement::LenientVersionSpecifiers; pub use lenient_requirement::*;
pub use metadata::{Error, Metadata21}; pub use metadata::*;
pub use simple_json::{DistInfoMetadata, File, Hashes, SimpleJson, Yanked}; pub use simple_json::*;
mod direct_url; mod direct_url;
mod index_url; mod index_url;