summaryrefslogtreecommitdiffstats
path: root/ipfs-api/src/client.rs
diff options
context:
space:
mode:
authorFerris Tseng <ferristseng@fastmail.fm>2019-02-13 21:51:57 -0500
committerFerris Tseng <ferristseng@fastmail.fm>2019-02-13 21:51:57 -0500
commit0cd34b196863325132e54bc8f36b196659baeb17 (patch)
treeafed8e2c10d7fdfa29d7f79191ddffbef6cdef26 /ipfs-api/src/client.rs
parentde3588c7c369ea4f4cca66f89c12511d1170e5f5 (diff)
formatting; docs update; version increment; small refactors
Diffstat (limited to 'ipfs-api/src/client.rs')
-rw-r--r--ipfs-api/src/client.rs20
1 files changed, 8 insertions, 12 deletions
diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs
index 5e1e9f5..69411ee 100644
--- a/ipfs-api/src/client.rs
+++ b/ipfs-api/src/client.rs
@@ -22,14 +22,18 @@ use http::StatusCode;
use hyper::client::{Client, HttpConnector};
#[cfg(feature = "hyper")]
use hyper_multipart::client::multipart;
+use multiaddr::{AddrComponent, ToMultiaddr};
use read::{JsonLineDecoder, LineDecoder, StreamReader};
use request::{self, ApiRequest};
use response::{self, Error};
use serde::{Deserialize, Serialize};
use serde_json;
-use std::io::Read;
-use std::net::SocketAddr;
-use std::path::{Path, PathBuf};
+use std::{
+ fs,
+ io::Read,
+ net::{IpAddr, SocketAddr},
+ path::{Path, PathBuf},
+};
use tokio_codec::{Decoder, FramedRead};
/// A response returned by the HTTP client.
@@ -70,16 +74,8 @@ impl Default for IpfsClient {
/// If not found, tries to connect to `localhost:5001`.
///
fn default() -> IpfsClient {
- use multiaddr::{AddrComponent, ToMultiaddr};
- use std::fs;
- use std::net::IpAddr;
-
dirs::home_dir()
- .map(|mut home_dir| {
- home_dir.push(".ipfs");
- home_dir.push("api");
- 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_str| multiaddr_str.to_multiaddr().ok())
.and_then(|multiaddr| {