refactor!: flatten RefMap::new() arguments

Author: djc

gitoxide-core/src/pack/receive.rs

@@ -85,12 +85,10 @@ where
     let refmap = gix::protocol::fetch::RefMap::new(
         &mut progress,
         &fetch_refspecs,
-        gix::protocol::fetch::Context {
-            handshake: &mut handshake,
-            transport: &mut transport.inner,
-            user_agent: user_agent.clone(),
-            trace_packetlines,
-        },
+        &mut handshake,
+        &mut transport.inner,
+        user_agent.clone(),
+        trace_packetlines,
         gix::protocol::fetch::refmap::init::Options::default(),
     )
     .await?;

gix-protocol/src/fetch/refmap/init.rs

@@ -1,4 +1,4 @@
-use std::collections::HashSet;
+use std::{borrow::Cow, collections::HashSet};
 
 use bstr::{BString, ByteSlice, ByteVec};
 use gix_features::progress::Progress;
@@ -11,11 +11,10 @@ use crate::transport::client::async_io::Transport;
 use crate::transport::client::blocking_io::Transport;
 use crate::{
     fetch::{
-        self,
         refmap::{Mapping, Source, SpecIndex},
         RefMap,
     },
-    handshake::Ref,
+    handshake::{Outcome, Ref},
 };
 
 /// The error returned by [`RefMap::new()`].
@@ -55,9 +54,6 @@ impl RefMap {
     /// Create a new instance by obtaining all references on the remote that have been filtered through our remote's
     /// for _fetching_.
     ///
-    /// A [context](fetch::Context) is provided to bundle what would be additional parameters,
-    /// and [options](Options) are used to further configure the call.
-    ///
     /// * `progress` is used if `ls-refs` is invoked on the remote. Always the case when V2 is used.
     /// * `fetch_refspecs` are all explicit refspecs to identify references on the remote that you are interested in.
     ///    Note that these are copied to [`RefMap::refspecs`] for convenience, as `RefMap::mappings` refer to them by index.
@@ -66,12 +62,10 @@ impl RefMap {
     pub async fn new<T>(
         mut progress: impl Progress,
         fetch_refspecs: &[gix_refspec::RefSpec],
-        fetch::Context {
-            handshake,
-            transport,
-            user_agent,
-            trace_packetlines,
-        }: fetch::Context<'_, T>,
+        handshake: &mut Outcome,
+        transport: &mut T,
+        user_agent: (&'static str, Option<Cow<'static, str>>),
+        trace_packetlines: bool,
         Options {
             prefix_from_spec_as_filter_on_remote,
             extra_refspecs,

gix/src/remote/connection/ref_map.rs

@@ -153,12 +153,10 @@ where
         let refmap = gix_protocol::fetch::RefMap::new(
             progress,
             &self.remote.fetch_specs,
-            gix_protocol::fetch::Context {
-                handshake: &mut handshake,
-                transport: &mut self.transport.inner,
-                user_agent: self.remote.repo.config.user_agent_tuple(),
-                trace_packetlines: self.trace,
-            },
+            &mut handshake,
+            &mut self.transport.inner,
+            self.remote.repo.config.user_agent_tuple(),
+            self.trace,
             gix_protocol::fetch::refmap::init::Options {
                 prefix_from_spec_as_filter_on_remote,
                 extra_refspecs,