diff --git a/crates/puffin-resolver/src/error.rs b/crates/puffin-resolver/src/error.rs index d215b805c..27a715f36 100644 --- a/crates/puffin-resolver/src/error.rs +++ b/crates/puffin-resolver/src/error.rs @@ -2,7 +2,6 @@ use std::fmt::Formatter; use pubgrub::range::Range; use pubgrub::report::{DefaultStringReporter, DerivationTree, Reporter}; -use pypi_types::IndexUrl; use rustc_hash::FxHashMap; use thiserror::Error; use url::Url; @@ -12,10 +11,10 @@ use pep508_rs::Requirement; use puffin_distribution::DistributionDatabaseError; use puffin_normalize::PackageName; use puffin_traits::OnceMap; +use pypi_types::IndexUrl; -use crate::pubgrub::{PubGrubPackage, PubGrubVersion}; +use crate::pubgrub::{PubGrubPackage, PubGrubReportFormatter, PubGrubVersion}; use crate::version_map::VersionMap; -use crate::PubGrubReportFormatter; #[derive(Error, Debug)] pub enum ResolveError { diff --git a/crates/puffin-resolver/src/lib.rs b/crates/puffin-resolver/src/lib.rs index c65093f14..f2de17c73 100644 --- a/crates/puffin-resolver/src/lib.rs +++ b/crates/puffin-resolver/src/lib.rs @@ -2,7 +2,6 @@ pub use error::ResolveError; pub use finder::{DistFinder, Reporter as FinderReporter}; pub use manifest::Manifest; pub use prerelease_mode::PreReleaseMode; -pub use pubgrub::PubGrubReportFormatter; pub use resolution::ResolutionGraph; pub use resolution_mode::ResolutionMode; pub use resolution_options::ResolutionOptions; diff --git a/crates/puffin-resolver/src/pubgrub/mod.rs b/crates/puffin-resolver/src/pubgrub/mod.rs index 4d0ba0721..eb7004dec 100644 --- a/crates/puffin-resolver/src/pubgrub/mod.rs +++ b/crates/puffin-resolver/src/pubgrub/mod.rs @@ -2,7 +2,7 @@ pub(crate) use crate::pubgrub::dependencies::PubGrubDependencies; pub(crate) use crate::pubgrub::distribution::PubGrubDistribution; pub(crate) use crate::pubgrub::package::PubGrubPackage; pub(crate) use crate::pubgrub::priority::{PubGrubPriorities, PubGrubPriority}; -pub use crate::pubgrub::report::PubGrubReportFormatter; +pub(crate) use crate::pubgrub::report::PubGrubReportFormatter; pub(crate) use crate::pubgrub::version::{PubGrubVersion, MIN_VERSION}; mod dependencies; diff --git a/crates/puffin-resolver/src/pubgrub/report.rs b/crates/puffin-resolver/src/pubgrub/report.rs index f75ce3ff8..0729179fb 100644 --- a/crates/puffin-resolver/src/pubgrub/report.rs +++ b/crates/puffin-resolver/src/pubgrub/report.rs @@ -7,9 +7,9 @@ use rustc_hash::FxHashMap; use super::{PubGrubPackage, PubGrubVersion}; #[derive(Debug)] -pub struct PubGrubReportFormatter<'a> { +pub(crate) struct PubGrubReportFormatter<'a> { /// The versions that were available for each package - pub available_versions: &'a FxHashMap>, + pub(crate) available_versions: &'a FxHashMap>, } impl PubGrubReportFormatter<'_> {