tests: import RefsAction directly

Author: djc

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

@@ -199,7 +199,7 @@ mod delegate {
     use gix_protocol::{
         fetch::{Arguments, Response},
         handshake::Ref,
-        ls_refs,
+        ls_refs::{self, RefsAction},
     };
     use gix_transport::client::Capabilities;
 
@@ -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::RefsAction> {
-            Ok(ls_refs::RefsAction::Continue)
+        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> std::io::Result<RefsAction> {
+            Ok(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::RefsAction> {
+        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<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::RefsAction> {
+        fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<RefsAction> {
             self.deref_mut().prepare_ls_refs(_server)
         }
 

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

@@ -3,7 +3,8 @@ use std::{borrow::Cow, io};
 use bstr::{BString, ByteSlice};
 use gix_protocol::{
     fetch::{Arguments, Response},
-    handshake, ls_refs,
+    handshake,
+    ls_refs::{self, RefsAction},
 };
 use gix_transport::client::Capabilities;
 
@@ -102,8 +103,8 @@ pub struct CloneRefInWantDelegate {
 }
 
 impl DelegateBlocking for CloneRefInWantDelegate {
-    fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<ls_refs::RefsAction> {
-        Ok(ls_refs::RefsAction::Skip)
+    fn prepare_ls_refs(&mut self, _server: &Capabilities) -> io::Result<RefsAction> {
+        Ok(RefsAction::Skip)
     }
 
     fn prepare_fetch(
@@ -141,10 +142,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::RefsAction> {
+    fn prepare_ls_refs(&mut self, _server: &Capabilities) -> std::io::Result<RefsAction> {
         match self.abort_with.take() {
             Some(err) => Err(err),
-            None => Ok(ls_refs::RefsAction::Continue),
+            None => Ok(RefsAction::Continue),
         }
     }
     fn prepare_fetch(