refactor!: rename ls_refs::Action to RefsAction

Author: djc

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

@@ -80,7 +80,7 @@ impl RefMap {
         let remote_refs = crate::ls_refs(
             transport,
             capabilities,
-            |_capabilities| Ok(crate::ls_refs::Action::Continue),
+            |_capabilities| Ok(crate::ls_refs::RefsAction::Continue),
             push_prefix_arguments(prefix_from_spec_as_filter_on_remote, &all_refspecs),
             &mut progress,
             trace_packetlines,

gix-protocol/src/ls_refs.rs

@@ -31,7 +31,7 @@ pub use error::Error;
 
 /// What to do after preparing ls-refs in [`ls_refs()`][crate::ls_refs()].
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
-pub enum Action {
+pub enum RefsAction {
     /// Continue by sending a 'ls-refs' command.
     Continue,
     /// Skip 'ls-refs' entirely.
@@ -50,7 +50,7 @@ pub(crate) mod function {
     use gix_transport::client::Capabilities;
     use maybe_async::maybe_async;
 
-    use super::{Action, Error};
+    use super::{Error, RefsAction};
     #[cfg(feature = "async-client")]
     use crate::transport::client::async_io::{Transport, TransportV2Ext};
     #[cfg(feature = "blocking-client")]
@@ -70,7 +70,7 @@ pub(crate) mod function {
     pub async fn ls_refs(
         mut transport: impl Transport,
         capabilities: &Capabilities,
-        prepare_ls_refs: impl FnOnce(&Capabilities) -> std::io::Result<Action>,
+        prepare_ls_refs: impl FnOnce(&Capabilities) -> std::io::Result<RefsAction>,
         extra_args: Vec<BString>,
         progress: &mut impl Progress,
         trace: bool,
@@ -91,8 +91,8 @@ pub(crate) mod function {
 
         ls_args.extend(extra_args);
         let refs = match prepare_ls_refs(capabilities) {
-            Ok(Action::Skip) => Vec::new(),
-            Ok(Action::Continue) => {
+            Ok(RefsAction::Skip) => Vec::new(),
+            Ok(RefsAction::Continue) => {
                 ls_refs.validate_argument_prefixes(
                     gix_transport::Protocol::V2,
                     capabilities,

gix-protocol/tests/protocol/fetch/_impl.rs

@@ -234,8 +234,8 @@ mod delegate {
         /// If the delegate returns [`ls_refs::Action::Skip`], no `ls-refs` command is sent to the server.
         ///
         /// Note that this is called only if we are using protocol version 2.
-        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> std::io::Result<ls_refs::Action> {
-            Ok(ls_refs::Action::Continue)
+        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> std::io::Result<ls_refs::RefsAction> {
+            Ok(ls_refs::RefsAction::Continue)
         }
 
         /// Called before invoking the 'fetch' interaction with `features` pre-filled for typical use
@@ -299,7 +299,7 @@ mod delegate {
             self.deref().handshake_extra_parameters()
         }
 
-        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<ls_refs::Action> {
+        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<ls_refs::RefsAction> {
             self.deref_mut().prepare_ls_refs(_server)
         }
 
@@ -328,7 +328,7 @@ mod delegate {
             self.deref().handshake_extra_parameters()
         }
 
-        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<ls_refs::Action> {
+        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<ls_refs::RefsAction> {
             self.deref_mut().prepare_ls_refs(_server)
         }
 

gix-protocol/tests/protocol/fetch/mod.rs

@@ -102,8 +102,8 @@ pub struct CloneRefInWantDelegate {
 }
 
 impl DelegateBlocking for CloneRefInWantDelegate {
-    fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<ls_refs::Action> {
-        Ok(ls_refs::Action::Skip)
+    fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<ls_refs::RefsAction> {
+        Ok(ls_refs::RefsAction::Skip)
     }
 
     fn prepare_fetch(
@@ -141,10 +141,10 @@ impl DelegateBlocking for LsRemoteDelegate {
     fn handshake_extra_parameters(&self) -> Vec<(String, Option<String>)> {
         vec![("value-only".into(), None), ("key".into(), Some("value".into()))]
     }
-    fn prepare_ls_refs(&mut self, _server: &Capabilities) -> std::io::Result<ls_refs::Action> {
+    fn prepare_ls_refs(&mut self, _server: &Capabilities) -> std::io::Result<ls_refs::RefsAction> {
         match self.abort_with.take() {
             Some(err) => Err(err),
-            None => Ok(ls_refs::Action::Continue),
+            None => Ok(ls_refs::RefsAction::Continue),
         }
     }
     fn prepare_fetch(