mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-03 18:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Take unowned request in PythonInstallation::find_or_download (#6868)

Browse source
This commit is contained in:
Charlie Marsh 2024-08-30 09:49:17 -04:00 • committed by GitHub
parent a1805d175e
commit 95416ad52e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/uv-python/src/installation.rs
View file

@ -78,7 +78,7 @@ impl PythonInstallation {
///
/// Unlike [`PythonInstallation::find`], if the required Python is not installed it will be installed automatically.
pub async fn find_or_download<'a>(
request: Option<PythonRequest>,
request: Option<&PythonRequest>,
environments: EnvironmentPreference,
preference: PythonPreference,
python_downloads: PythonDownloads,
@ -86,10 +86,10 @@ impl PythonInstallation {
cache: &Cache,
reporter: Option<&dyn Reporter>,
) -> Result<Self, Error> {
let request = request.unwrap_or_default();
let request = request.unwrap_or_else(|| &PythonRequest::Any);
// Search for the installation
match Self::find(&request, environments, preference, cache) {
match Self::find(request, environments, preference, cache) {
Ok(venv) => Ok(venv),
// If missing and allowed, perform a fetch
Err(Error::MissingPython(err))
@ -97,7 +97,7 @@ impl PythonInstallation {
&& python_downloads.is_automatic()
&& client_builder.connectivity.is_online() =>
{
if let Some(request) = PythonDownloadRequest::from_request(&request) {
if let Some(request) = PythonDownloadRequest::from_request(request) {
debug!("Requested Python not found, checking for available download...");
match Self::fetch(request.fill()?, client_builder, cache, reporter).await {
Ok(installation) => Ok(installation),