mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 13:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove Box<Pin<...>> from process_request (#242)

Browse source
This commit is contained in:
Charlie Marsh 2023-10-30 13:34:57 -07:00 • committed by GitHub
parent 35d6bd761b
commit 1f059b30dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/puffin-resolver/src/resolver.rs
View file

@ -2,8 +2,6 @@
use std::collections::hash_map::Entry;
use std::collections::BTreeMap;
use std::future::Future;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::Arc;
@ -566,24 +564,23 @@ impl<'a, Context: BuildContext + Sync> Resolver<'a, Context> {
Ok::<(), ResolveError>(())
}
fn process_request(
&'a self,
request: Request,
) -> Pin<Box<dyn Future<Output = Result<Response, ResolveError>> + Send + 'a>> {
async fn process_request(&'a self, request: Request) -> Result<Response, ResolveError> {
match request {
Request::Package(package_name) => Box::pin(
Request::Package(package_name) => {
self.client
.simple(package_name.clone())
.map_ok(move |metadata| Response::Package(package_name, metadata))
.map_err(ResolveError::Client),
),
Request::Wheel(file) => Box::pin(
.map_err(ResolveError::Client)
.await
}
Request::Wheel(file) => {
self.client
.file(file.clone().into())
.map_ok(move |metadata| Response::Wheel(file, metadata))
.map_err(ResolveError::Client),
),
Request::Sdist(file, package_name, version) => Box::pin(async move {
.map_err(ResolveError::Client)
.await
}
Request::Sdist(file, package_name, version) => {
let cached_wheel = self.build_context.cache().and_then(|cache| {
BuiltSourceDistributionCache::new(cache).find_wheel(
&package_name,
@ -607,9 +604,8 @@ impl<'a, Context: BuildContext + Sync> Resolver<'a, Context> {
filename: file.filename.clone(),
err,
})?;
Ok(Response::Sdist(file, metadata21))
}),
}
}
}