fix: tidy up features

The `russh` feature shouldn't require `async-std`, but that feature was
gating the whole async subsystem, so this moves things around a little.

Author: plaflamme

gix-transport/Cargo.toml

@@ -65,7 +65,7 @@ async-client = [
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
 serde = ["dep:serde"]
 
-russh = ["dep:russh", "dep:tokio", "async-client", "async-std"]
+russh = ["dep:russh", "dep:tokio", "async-client"]
 
 [[test]]
 name = "blocking-transport"

gix-transport/src/client/async_io/connect.rs

@@ -1,13 +1,12 @@
 pub use crate::client::non_io_types::connect::{Error, Options};
 
-#[cfg(feature = "async-std")]
 pub(crate) mod function {
-    use crate::client::{git, non_io_types::connect::Error};
+    use crate::client::non_io_types::connect::Error;
 
     /// A general purpose connector connecting to a repository identified by the given `url`.
     ///
     /// This includes connections to
-    /// [git daemons][crate::client::git::connect()] only at the moment.
+    /// [git daemons][crate::client::git::connect()] and `ssh`,
     ///
     /// Use `options` to further control specifics of the transport resulting from the connection.
     pub async fn connect<Url, E>(
@@ -18,28 +17,30 @@ pub(crate) mod function {
         Url: TryInto<gix_url::Url, Error = E>,
         gix_url::parse::Error: From<E>,
     {
-        let mut url = url.try_into().map_err(gix_url::parse::Error::from)?;
+        let url = url.try_into().map_err(gix_url::parse::Error::from)?;
         Ok(match url.scheme {
+            #[cfg(feature = "async-std")]
             gix_url::Scheme::Git => {
                 if url.user().is_some() {
                     return Err(Error::UnsupportedUrlTokens {
                         url: url.to_bstring(),
                         scheme: url.scheme,
                     });
                 }
-                let path = std::mem::take(&mut url.path);
+
                 Box::new(
-                    git::Connection::new_tcp(
+                    crate::client::git::Connection::new_tcp(
                         url.host().expect("host is present in url"),
                         url.port,
-                        path,
+                        url.path.clone(),
                         options.version,
                         options.trace,
                     )
                     .await
                     .map_err(|e| Box::new(e) as Box<dyn std::error::Error + Send + Sync>)?,
                 )
             }
+            #[cfg(feature = "russh")]
             gix_url::Scheme::Ssh => {
                 Box::new(crate::client::async_io::ssh::connect(url, options.version, options.trace).await?)
             }

gix-transport/src/client/async_io/mod.rs

@@ -9,7 +9,6 @@ pub use traits::{SetServiceResponse, Transport, TransportV2Ext};
 
 ///
 pub mod connect;
-#[cfg(feature = "async-std")]
 pub use connect::function::connect;
 
 #[cfg(feature = "russh")]

gix-transport/src/lib.rs

@@ -85,7 +85,7 @@ pub use traits::IsSpuriousError;
 pub mod client;
 
 #[doc(inline)]
-#[cfg(any(feature = "blocking-client", all(feature = "async-client", feature = "async-std")))]
+#[cfg(any(feature = "blocking-client", feature = "async-client"))]
 pub use client::connect;
 
 #[cfg(all(feature = "async-client", feature = "blocking-client"))]