imageproxy: drop generic parameters from impl_request()

These can be expressed with `impl Trait` argument syntax, making things
a bit easier to read.

Signed-off-by: Allison Karlitskaya <[email protected]>
Signed-off-by: Colin Walters <[email protected]>

Author: allisonkarlitskaya

src/imageproxy.rs

@@ -426,7 +426,7 @@ impl ImageProxy {
         };
 
         // Verify semantic version
-        let protover = r.impl_request::<String, _, ()>("Initialize", []).await?.0;
+        let protover = r.impl_request::<String>("Initialize", [(); 0]).await?.0;
         tracing::debug!("Remote protocol version: {protover}");
         let protover = semver::Version::parse(protover.as_str())?;
         // Previously we had a feature to opt-in to requiring newer versions using `if cfg!()`.
@@ -494,15 +494,11 @@ impl ImageProxy {
     }
 
     #[instrument(skip(args))]
-    async fn impl_request<R: serde::de::DeserializeOwned + Send + 'static, T, I>(
+    async fn impl_request<R: serde::de::DeserializeOwned + Send + 'static>(
         &self,
         method: &str,
-        args: T,
-    ) -> Result<(R, Option<FileDescriptors>)>
-    where
-        T: IntoIterator<Item = I>,
-        I: Into<serde_json::Value>,
-    {
+        args: impl IntoIterator<Item = impl Into<serde_json::Value>>,
+    ) -> Result<(R, Option<FileDescriptors>)> {
         let req = Self::impl_request_raw(Arc::clone(&self.sockfd), Request::new(method, args));
         let mut childwait = self.childwait.lock().await;
         tokio::select! {
@@ -529,7 +525,7 @@ impl ImageProxy {
     pub async fn open_image(&self, imgref: &str) -> Result<OpenedImage> {
         tracing::debug!("opening image");
         let (imgid, _) = self
-            .impl_request::<u32, _, _>("OpenImage", [imgref])
+            .impl_request::<u32>("OpenImage", [imgref])
             .await?;
         Ok(OpenedImage(imgid))
     }
@@ -538,7 +534,7 @@ impl ImageProxy {
     pub async fn open_image_optional(&self, imgref: &str) -> Result<Option<OpenedImage>> {
         tracing::debug!("opening image");
         let (imgid, _) = self
-            .impl_request::<u32, _, _>("OpenImageOptional", [imgref])
+            .impl_request::<u32>("OpenImageOptional", [imgref])
             .await?;
         if imgid == 0 {
             Ok(None)
@@ -592,7 +588,7 @@ impl ImageProxy {
     /// For more information on OCI config, see <https://github.com/opencontainers/image-spec/blob/main/config.md>
     pub async fn fetch_config_raw(&self, img: &OpenedImage) -> Result<Vec<u8>> {
         let (_, fd) = self
-            .impl_request::<(), _, _>("GetFullConfig", [img.0])
+            .impl_request::<()>("GetFullConfig", [img.0])
             .await?;
         self.read_all_fd(fd).await
     }
@@ -631,7 +627,7 @@ impl ImageProxy {
         tracing::debug!("fetching blob");
         let args: Vec<serde_json::Value> =
             vec![img.0.into(), digest.to_string().into(), size.into()];
-        let (_bloblen, fd) = self.impl_request::<i64, _, _>("GetBlob", args).await?;
+        let (_bloblen, fd) = self.impl_request::<i64>("GetBlob", args).await?;
         let fd = fd.ok_or_else(|| Error::Other("Missing fd from reply".into()))?;
         let FileDescriptors::FinishPipe { pipeid, datafd } = fd else {
             return Err(Error::Other("got dualfds, expecting FinishPipe fd".into()));
@@ -683,7 +679,7 @@ impl ImageProxy {
     )> {
         tracing::debug!("fetching blob");
         let args: Vec<serde_json::Value> = vec![img.0.into(), digest.to_string().into()];
-        let (bloblen, fd) = self.impl_request::<u64, _, _>("GetRawBlob", args).await?;
+        let (bloblen, fd) = self.impl_request::<u64>("GetRawBlob", args).await?;
         let fd = fd.ok_or_else(|| Error::new_other("Missing fd from reply"))?;
         let FileDescriptors::DualFds { datafd, errfd } = fd else {
             return Err(Error::Other("got single fd, expecting dual fds".into()));
@@ -716,7 +712,7 @@ impl ImageProxy {
         tracing::debug!("Getting layer info");
         if layer_info_piped_proto_version().matches(&self.protover) {
             let (_, fd) = self
-                .impl_request::<(), _, _>("GetLayerInfoPiped", [img.0])
+                .impl_request::<()>("GetLayerInfoPiped", [img.0])
                 .await?;
             let buf = self.read_all_fd(fd).await?;
             return Ok(Some(serde_json::from_slice(&buf)?));