mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-02 04:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Run cargo update (#14899)

Browse source
This commit is contained in:
Zanie Blue 2025-07-25 15:19:38 -05:00 • committed by GitHub
parent 396e198081
commit 7b8dd5cfaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 483 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/uv-installer/src/installer.rs
View file

@ -107,10 +107,10 @@ impl<'a> Installer<'a> {
rayon::spawn(move || {
let result = install(
wheels,
layout,
installer_name,
&layout,
installer_name.as_ref(),
link_mode,
reporter,
reporter.as_ref(),
relocatable,
installer_metadata,
);
@ -137,10 +137,10 @@ impl<'a> Installer<'a> {
install(
wheels,
self.venv.interpreter().layout(),
self.name,
&self.venv.interpreter().layout(),
self.name.as_ref(),
self.link_mode,
self.reporter,
self.reporter.as_ref(),
self.venv.relocatable(),
self.metadata,
)
@ -151,10 +151,10 @@ impl<'a> Installer<'a> {
#[instrument(skip_all, fields(num_wheels = %wheels.len()))]
fn install(
wheels: Vec<CachedDist>,
layout: Layout,
installer_name: Option<String>,
layout: &Layout,
installer_name: Option<&String>,
link_mode: LinkMode,
reporter: Option<Arc<dyn Reporter>>,
reporter: Option<&Arc<dyn Reporter>>,
relocatable: bool,
installer_metadata: bool,
) -> Result<Vec<CachedDist>> {
@ -163,7 +163,7 @@ fn install(
let locks = uv_install_wheel::Locks::default();
wheels.par_iter().try_for_each(|wheel| {
uv_install_wheel::install_wheel(
&layout,
layout,
relocatable,
wheel.path(),
wheel.filename(),
@ -176,7 +176,7 @@ fn install(
} else {
Some(wheel.cache_info())
},
installer_name.as_deref(),
installer_name.map(String::as_str),
installer_metadata,
link_mode,
&locks,

14
crates/uv-resolver/src/resolver/mod.rs
View file

@ -290,7 +290,7 @@ impl<Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvider>
thread::Builder::new()
.name("uv-resolver".into())
.spawn(move || {
let result = solver.solve(request_sink);
let result = solver.solve(&request_sink);
// This may fail if the main thread returned early due to an error.
let _ = tx.send(result);
@ -311,7 +311,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
#[instrument(skip_all)]
fn solve(
self: Arc<Self>,
request_sink: Sender<Request>,
request_sink: &Sender<Request>,
) -> Result<ResolverOutput, ResolveError> {
debug!(
"Solving with installed Python version: {}",
@ -390,7 +390,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
&self.urls,
&self.indexes,
&state.python_requirement,
&request_sink,
request_sink,
)?;
}
@ -494,7 +494,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
// since we weren't sure whether it might also be a URL requirement when
// transforming the requirements. For that case, we do another request here
// (idempotent due to caching).
self.request_package(next_package, url, index, &request_sink)?;
self.request_package(next_package, url, index, request_sink)?;
let version = if let Some(version) = state.initial_version.take() {
// If we just forked based on platform support, we can skip version selection,
@ -519,7 +519,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
&state.python_requirement,
&state.pubgrub,
&mut visited,
&request_sink,
request_sink,
)?;
// Pick the next compatible version.
@ -651,7 +651,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
})?;
// Emit a request to fetch the metadata for each registry package.
self.visit_dependencies(&dependencies, &state, &request_sink)
self.visit_dependencies(&dependencies, &state, request_sink)
.map_err(|err| {
enrich_dependency_error(err, next_id, &version, &state.pubgrub)
})?;
@ -695,7 +695,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
state,
&version,
forks,
&request_sink,
request_sink,
&diverging_packages,
) {
forked_states.push(new_fork_state?);