Remove some unnecessary Interpreter clones (#3999)

This commit is contained in:
Charlie Marsh 2024-06-03 18:09:42 -04:00 committed by GitHub
parent ef43bcb233
commit b27d36baee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 14 deletions

View file

@ -135,13 +135,13 @@ mod resolver {
let index = InMemoryIndex::default(); let index = InMemoryIndex::default();
let index_locations = IndexLocations::default(); let index_locations = IndexLocations::default();
let installed_packages = EmptyInstalledPackages; let installed_packages = EmptyInstalledPackages;
let interpreter = venv.interpreter().clone(); let interpreter = venv.interpreter();
let python_requirement = PythonRequirement::from_marker_environment(&interpreter, &MARKERS); let python_requirement = PythonRequirement::from_marker_environment(interpreter, &MARKERS);
let build_context = BuildDispatch::new( let build_context = BuildDispatch::new(
client, client,
&cache, &cache,
&interpreter, interpreter,
&index_locations, &index_locations,
&flat_index, &flat_index,
&index, &index,

View file

@ -207,7 +207,7 @@ pub(crate) async fn pip_install(
} }
} }
let interpreter = venv.interpreter().clone(); let interpreter = venv.interpreter();
// Determine the tags, markers, and interpreter to use for resolution. // Determine the tags, markers, and interpreter to use for resolution.
let tags = match (python_platform, python_version.as_ref()) { let tags = match (python_platform, python_version.as_ref()) {
@ -310,7 +310,7 @@ pub(crate) async fn pip_install(
let resolve_dispatch = BuildDispatch::new( let resolve_dispatch = BuildDispatch::new(
&client, &client,
&cache, &cache,
&interpreter, interpreter,
&index_locations, &index_locations,
&flat_index, &flat_index,
&index, &index,
@ -348,7 +348,7 @@ pub(crate) async fn pip_install(
&hasher, &hasher,
&reinstall, &reinstall,
&upgrade, &upgrade,
&interpreter, interpreter,
&tags, &tags,
Some(&markers), Some(&markers),
&client, &client,
@ -383,7 +383,7 @@ pub(crate) async fn pip_install(
BuildDispatch::new( BuildDispatch::new(
&client, &client,
&cache, &cache,
&interpreter, interpreter,
&index_locations, &index_locations,
&flat_index, &flat_index,
&index, &index,

View file

@ -92,7 +92,7 @@ pub(super) async fn do_lock(
let project_name = project.project_name().clone(); let project_name = project.project_name().clone();
// Determine the tags, markers, and interpreter to use for resolution. // Determine the tags, markers, and interpreter to use for resolution.
let interpreter = venv.interpreter().clone(); let interpreter = venv.interpreter();
let tags = venv.interpreter().tags()?; let tags = venv.interpreter().tags()?;
let markers = venv.interpreter().markers(); let markers = venv.interpreter().markers();
@ -131,7 +131,7 @@ pub(super) async fn do_lock(
let build_dispatch = BuildDispatch::new( let build_dispatch = BuildDispatch::new(
&client, &client,
cache, cache,
&interpreter, interpreter,
index_locations, index_locations,
&flat_index, &flat_index,
&index, &index,
@ -160,7 +160,7 @@ pub(super) async fn do_lock(
&hasher, &hasher,
&reinstall, &reinstall,
&upgrade, &upgrade,
&interpreter, interpreter,
tags, tags,
None, None,
&client, &client,

View file

@ -149,7 +149,7 @@ pub(crate) async fn update_environment(
} }
// Determine the tags, markers, and interpreter to use for resolution. // Determine the tags, markers, and interpreter to use for resolution.
let interpreter = venv.interpreter().clone(); let interpreter = venv.interpreter();
let tags = venv.interpreter().tags()?; let tags = venv.interpreter().tags()?;
let markers = venv.interpreter().markers(); let markers = venv.interpreter().markers();
@ -187,7 +187,7 @@ pub(crate) async fn update_environment(
let resolve_dispatch = BuildDispatch::new( let resolve_dispatch = BuildDispatch::new(
&client, &client,
cache, cache,
&interpreter, interpreter,
index_locations, index_locations,
&flat_index, &flat_index,
&index, &index,
@ -216,7 +216,7 @@ pub(crate) async fn update_environment(
&hasher, &hasher,
&reinstall, &reinstall,
&upgrade, &upgrade,
&interpreter, interpreter,
tags, tags,
Some(markers), Some(markers),
&client, &client,
@ -245,7 +245,7 @@ pub(crate) async fn update_environment(
BuildDispatch::new( BuildDispatch::new(
&client, &client,
cache, cache,
&interpreter, interpreter,
index_locations, index_locations,
&flat_index, &flat_index,
&index, &index,