Remove some unused methods (#5512)

This commit is contained in:
Charlie Marsh 2024-07-28 13:20:12 -04:00 committed by GitHub
parent 1734c7ed50
commit 88340fbd0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 1 additions and 117 deletions

View File

@ -551,11 +551,6 @@ impl Extras {
pub fn parse<T: Pep508Url>(input: &str) -> Result<Self, Pep508Error<T>> { pub fn parse<T: Pep508Url>(input: &str) -> Result<Self, Pep508Error<T>> {
Ok(Self(parse_extras_cursor(&mut Cursor::new(input))?)) Ok(Self(parse_extras_cursor(&mut Cursor::new(input))?))
} }
/// Convert the [`Extras`] into a [`Vec`] of [`ExtraName`].
pub fn into_vec(self) -> Vec<ExtraName> {
self.0
}
} }
/// The actual version specifier or URL to install. /// The actual version specifier or URL to install.

View File

@ -1,7 +1,7 @@
use uv_cache::Refresh; use uv_cache::Refresh;
use uv_configuration::ConfigSettings; use uv_configuration::ConfigSettings;
use uv_resolver::PreReleaseMode; use uv_resolver::PreReleaseMode;
use uv_settings::{InstallerOptions, PipOptions, ResolverInstallerOptions, ResolverOptions}; use uv_settings::{PipOptions, ResolverInstallerOptions, ResolverOptions};
use crate::{ use crate::{
BuildArgs, IndexArgs, InstallerArgs, Maybe, RefreshArgs, ResolverArgs, ResolverInstallerArgs, BuildArgs, IndexArgs, InstallerArgs, Maybe, RefreshArgs, ResolverArgs, ResolverInstallerArgs,
@ -166,61 +166,6 @@ impl From<IndexArgs> for PipOptions {
} }
} }
/// Construct the [`InstallerOptions`] from the [`InstallerArgs`] and [`BuildArgs`].
pub fn installer_options(installer_args: InstallerArgs, build_args: BuildArgs) -> InstallerOptions {
let InstallerArgs {
index_args,
reinstall,
no_reinstall,
reinstall_package,
index_strategy,
keyring_provider,
config_setting,
exclude_newer,
link_mode,
compile_bytecode,
no_compile_bytecode,
} = installer_args;
let BuildArgs {
no_build,
build,
no_build_package,
no_binary,
binary,
no_binary_package,
} = build_args;
InstallerOptions {
index_url: index_args.index_url.and_then(Maybe::into_option),
extra_index_url: index_args.extra_index_url.map(|extra_index_urls| {
extra_index_urls
.into_iter()
.filter_map(Maybe::into_option)
.collect()
}),
no_index: if index_args.no_index {
Some(true)
} else {
None
},
find_links: index_args.find_links,
reinstall: flag(reinstall, no_reinstall),
reinstall_package: Some(reinstall_package),
index_strategy,
keyring_provider,
config_settings: config_setting
.map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
exclude_newer,
link_mode,
compile_bytecode: flag(compile_bytecode, no_compile_bytecode),
no_build: flag(no_build, build),
no_build_package: Some(no_build_package),
no_binary: flag(no_binary, binary),
no_binary_package: Some(no_binary_package),
}
}
/// Construct the [`ResolverOptions`] from the [`ResolverArgs`] and [`BuildArgs`]. /// Construct the [`ResolverOptions`] from the [`ResolverArgs`] and [`BuildArgs`].
pub fn resolver_options(resolver_args: ResolverArgs, build_args: BuildArgs) -> ResolverOptions { pub fn resolver_options(resolver_args: ResolverArgs, build_args: BuildArgs) -> ResolverOptions {
let ResolverArgs { let ResolverArgs {

View File

@ -27,15 +27,6 @@ pub enum GitResolverError {
pub struct GitResolver(Arc<DashMap<RepositoryReference, GitSha>>); pub struct GitResolver(Arc<DashMap<RepositoryReference, GitSha>>);
impl GitResolver { impl GitResolver {
/// Initialize a [`GitResolver`] with a set of resolved references.
pub fn from_refs(refs: Vec<ResolvedRepositoryReference>) -> Self {
Self(Arc::new(
refs.into_iter()
.map(|ResolvedRepositoryReference { reference, sha }| (reference, sha))
.collect(),
))
}
/// Inserts a new [`GitSha`] for the given [`RepositoryReference`]. /// Inserts a new [`GitSha`] for the given [`RepositoryReference`].
pub fn insert(&self, reference: RepositoryReference, sha: GitSha) { pub fn insert(&self, reference: RepositoryReference, sha: GitSha) {
self.0.insert(reference, sha); self.0.insert(reference, sha);

View File

@ -130,13 +130,6 @@ impl SitePackages {
.collect() .collect()
} }
/// Returns `true` if there are any installed distributions with the given package name.
pub fn contains_package(&self, name: &PackageName) -> bool {
self.by_name
.get(name)
.is_some_and(|packages| !packages.is_empty())
}
/// Remove the given packages from the index, returning all installed versions, if any. /// Remove the given packages from the index, returning all installed versions, if any.
pub fn remove_packages(&mut self, name: &PackageName) -> Vec<InstalledDist> { pub fn remove_packages(&mut self, name: &PackageName) -> Vec<InstalledDist> {
let Some(indexes) = self.by_name.get(name) else { let Some(indexes) = self.by_name.get(name) else {

View File

@ -78,40 +78,6 @@ impl Interpreter {
}) })
} }
// TODO(konstin): Find a better way mocking the fields
pub fn artificial(platform: Platform, markers: MarkerEnvironment) -> Self {
Self {
platform,
markers: Box::new(markers),
scheme: Scheme {
purelib: PathBuf::from("/dev/null"),
platlib: PathBuf::from("/dev/null"),
include: PathBuf::from("/dev/null"),
scripts: PathBuf::from("/dev/null"),
data: PathBuf::from("/dev/null"),
},
virtualenv: Scheme {
purelib: PathBuf::from("/dev/null"),
platlib: PathBuf::from("/dev/null"),
include: PathBuf::from("/dev/null"),
scripts: PathBuf::from("/dev/null"),
data: PathBuf::from("/dev/null"),
},
sys_prefix: PathBuf::from("/dev/null"),
sys_base_exec_prefix: PathBuf::from("/dev/null"),
sys_base_prefix: PathBuf::from("/dev/null"),
sys_base_executable: None,
sys_executable: PathBuf::from("/dev/null"),
sys_path: vec![],
stdlib: PathBuf::from("/dev/null"),
tags: OnceLock::new(),
target: None,
prefix: None,
pointer_size: PointerSize::_64,
gil_disabled: false,
}
}
/// Return a new [`Interpreter`] with the given virtual environment root. /// Return a new [`Interpreter`] with the given virtual environment root.
#[must_use] #[must_use]
pub fn with_virtualenv(self, virtualenv: VirtualEnvironment) -> Self { pub fn with_virtualenv(self, virtualenv: VirtualEnvironment) -> Self {

View File

@ -57,10 +57,4 @@ impl AllowedYanks {
.get(package_name) .get(package_name)
.map_or(false, |versions| versions.contains(version)) .map_or(false, |versions| versions.contains(version))
} }
/// Returns versions for the given package which are allowed even if marked as yanked by the
/// relevant index.
pub fn allowed_versions(&self, package_name: &PackageName) -> Option<&FxHashSet<Version>> {
self.0.get(package_name)
}
} }