Merge pull request #135 from iamjpotts/20230831-fix-test-broke-by-typ…

…e-alias

Fix test broke by #131

ipfs-api-prelude/src/from_uri.rs

@@ -139,7 +139,7 @@ pub trait TryFromUri: Sized {
     fn from_ipfs_config() -> Option<Self> {
         dirs::home_dir()
             .map(|home_dir| home_dir.join(".ipfs").join("api"))
-            .and_then(|multiaddr_path| fs::read_to_string(&multiaddr_path).ok())
+            .and_then(|multiaddr_path| fs::read_to_string(multiaddr_path).ok())
             .and_then(|multiaddr_str| Self::from_multiaddr_str(&multiaddr_str).ok())
     }
 }

ipfs-api/tests/test_support/client.rs

@@ -10,26 +10,8 @@ use std::time::Duration;
 use ipfs_api::response::VersionResponse;
 use ipfs_api::{IpfsApi, IpfsClient, TryFromUri};
 
-#[cfg(feature = "with-hyper")]
-use hyper::client::HttpConnector;
-
-#[cfg(feature = "with-hyper-tls")]
-use hyper_tls::HttpsConnector;
-
-cfg_if::cfg_if! {
-    if #[cfg(feature = "with-actix")] {
-        pub fn build_client(api_url: &str) -> IpfsClient {
-            IpfsClient::from_str(api_url).unwrap()
-        }
-    } else if #[cfg(feature = "with-hyper-tls")] {
-        pub fn build_client(api_url: &str) -> IpfsClient<HttpsConnector<HttpConnector>> {
-            IpfsClient::from_str(api_url).unwrap()
-        }
-    } else if #[cfg(feature = "with-hyper")] {
-        pub fn build_client(api_url: &str) -> IpfsClient<HttpConnector> {
-            IpfsClient::from_str(api_url).unwrap()
-        }
-    }
+pub fn build_client(api_url: &str) -> IpfsClient {
+    IpfsClient::from_str(api_url).unwrap()
 }
 
 pub async fn wait_for_server<C: IpfsApi>(client: &C) -> Result<VersionResponse, String> {

ipfs-api/tests/test_support/resources.rs

@@ -13,7 +13,6 @@ use std::str::FromStr;
 fn strip_path_prefix(path: &Path) -> PathBuf {
     let base = path
         .components()
-        .into_iter()
         .next()
         .unwrap()
         .as_os_str()