Run cargo fmt for v1.26

Now that there's a new version, there's a small change to the formatter.
This updates the code base for that.

Added a small disabling rustfmt: #[cfg_attr(rustfmt, rustfmt_skip)]

Reference ticket:
rust-lang/rustfmt#2695

cli/src/account.rs

@@ -1,8 +1,8 @@
-use clap::ArgMatches;
-use stellar_client::{sync, endpoint::account, sync::Client};
 use super::{cursor, ordering, pager::Pager};
-use fmt::{Formatter, Simple};
+use clap::ArgMatches;
 use error::Result;
+use fmt::{Formatter, Simple};
+use stellar_client::{sync, endpoint::account, sync::Client};
 
 pub fn details(client: &Client, matches: &ArgMatches) -> Result<()> {
     let id = matches.value_of("ID").expect("ID is required");

cli/src/assets.rs

@@ -1,8 +1,8 @@
-use stellar_client::{endpoint::asset, sync::{self, Client}};
-use clap::ArgMatches;
 use super::{cursor, ordering, pager::Pager};
+use clap::ArgMatches;
 use error::Result;
 use fmt::{Formatter, Simple};
+use stellar_client::{endpoint::asset, sync::{self, Client}};
 
 /// Using a client and the arguments from the command line, iterates over the results
 /// and displays them to the end user.

cli/src/effects.rs

@@ -1,8 +1,8 @@
-use stellar_client::{endpoint::effect, sync::{self, Client}};
-use clap::ArgMatches;
 use super::{cursor, ordering, pager::Pager};
+use clap::ArgMatches;
 use error::Result;
 use fmt::{Formatter, Simple};
+use stellar_client::{endpoint::effect, sync::{self, Client}};
 
 /// Using a client and the arguments from the command line, iterates over the results
 /// and displays them to the end user.

cli/src/error.rs

@@ -1,8 +1,8 @@
-use stellar_client::error::Error;
+use resolution::ParseResolutionError;
 use std::error::Error as StdError;
 use std::fmt;
 use std::num::ParseIntError;
-use resolution::ParseResolutionError;
+use stellar_client::error::Error;
 
 /// A result including client specific errors.
 pub type Result<T> = ::std::result::Result<T, CliError>;

cli/src/fmt/simple/account.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::Account;
 
 impl Render<Account> for Simple {

cli/src/fmt/simple/asset.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::Asset;
 
 impl Render<Asset> for Simple {

cli/src/fmt/simple/effect.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::{AssetIdentifier, effect::{Effect, EffectKind as Kind}};
 
 impl Render<Effect> for Simple {

cli/src/fmt/simple/ledger.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::Ledger;
 
 impl Render<Ledger> for Simple {

cli/src/fmt/simple/offer.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::{AssetIdentifier, Offer};
 
 fn render_asset(id: &AssetIdentifier) -> String {

cli/src/fmt/simple/orderbook.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::Orderbook;
 
 impl Render<Orderbook> for Simple {

cli/src/fmt/simple/payment.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::{Operation, OperationKind};
 
 impl Render<Operation> for Simple {

cli/src/fmt/simple/trade_aggregation.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::TradeAggregation;
 
 impl Render<TradeAggregation> for Simple {

cli/src/fmt/simple/transaction.rs

@@ -1,5 +1,5 @@
-use fmt::Render;
 use super::Simple;
+use fmt::Render;
 use stellar_client::resources::Transaction;
 
 impl Render<Transaction> for Simple {

cli/src/ledgers.rs

@@ -1,8 +1,8 @@
-use stellar_client::{endpoint::ledger, sync::{self, Client}};
+use super::{cursor, ordering, pager::Pager};
 use clap::ArgMatches;
 use error::Result;
 use fmt::{Formatter, Simple};
-use super::{cursor, ordering, pager::Pager};
+use stellar_client::{endpoint::ledger, sync::{self, Client}};
 
 pub fn all(client: &Client, matches: &ArgMatches) -> Result<()> {
     let pager = Pager::from_arg(&matches);

cli/src/main.rs

@@ -5,13 +5,13 @@ extern crate clap;
 extern crate stellar_client;
 
 use clap::{App, AppSettings, Arg, SubCommand};
+use error::CliError;
 use pager::Pager;
 use stellar_client::{error::Error, sync::Client};
-use error::CliError;
 
 mod account;
-mod assets;
 mod asset_identifier;
+mod assets;
 mod cursor;
 mod effects;
 mod error;
@@ -29,12 +29,8 @@ mod transactions;
 fn build_app<'a, 'b>() -> App<'a, 'b> {
     macro_rules! listable {
         ($e:expr) => {
-            Pager::add(
-                ordering::add(
-                    cursor::add($e)
-                )
-            )
-        }
+            Pager::add(ordering::add(cursor::add($e)))
+        };
     }
 
     App::new("Stellar CLI")

cli/src/operations.rs

@@ -1,8 +1,8 @@
-use stellar_client::{endpoint::operation, sync::{self, Client}};
-use clap::ArgMatches;
 use super::{cursor, ordering, pager::Pager};
+use clap::ArgMatches;
 use error::Result;
 use fmt::{Formatter, Simple};
+use stellar_client::{endpoint::operation, sync::{self, Client}};
 
 pub fn all(client: &Client, matches: &ArgMatches) -> Result<()> {
     let pager = Pager::from_arg(&matches);

cli/src/payments.rs

@@ -1,8 +1,8 @@
-use stellar_client::{endpoint::payment, sync::{self, Client}};
+use super::{cursor, ordering, pager::Pager};
 use clap::ArgMatches;
 use error::Result;
 use fmt::{Formatter, Simple};
-use super::{cursor, ordering, pager::Pager};
+use stellar_client::{endpoint::payment, sync::{self, Client}};
 
 pub fn all(client: &Client, matches: &ArgMatches) -> Result<()> {
     let pager = Pager::from_arg(&matches);

cli/src/resolution.rs

@@ -1,5 +1,5 @@
-use std::str::FromStr;
 use self::Resolution::{Day, Hour, Min, Sec};
+use std::str::FromStr;
 
 /// Represents durations of time for the trade aggregations endpoint.
 pub enum Resolution {

cli/src/trades.rs

@@ -1,11 +1,11 @@
+use super::{cursor, ordering, pager::Pager};
 use asset_identifier;
 use chrono::{DateTime, Utc};
 use clap::ArgMatches;
 use error::Result;
 use fmt::{Formatter, Simple};
 use resolution::Resolution;
 use stellar_client::{endpoint::trade, sync::{self, Client}};
-use super::{cursor, ordering, pager::Pager};
 
 pub fn all(client: &Client, matches: &ArgMatches) -> Result<()> {
     let pager = Pager::from_arg(&matches);

cli/src/transactions.rs

@@ -1,8 +1,8 @@
-use stellar_client::{endpoint::transaction, sync::{self, Client}};
-use clap::ArgMatches;
 use super::{cursor, ordering, pager::Pager};
+use clap::ArgMatches;
 use error::Result;
 use fmt::{Formatter, Simple};
+use stellar_client::{endpoint::transaction, sync::{self, Client}};
 
 pub fn all(client: &Client, matches: &ArgMatches) -> Result<()> {
     let pager = Pager::from_arg(&matches);

client/src/client/async.rs

@@ -1,11 +1,11 @@
 //! This module contains the client for asynchronous communcation.
 
+use super::{Host, HORIZON_TEST_URI, HORIZON_URI};
+use error::{Error, Result};
+use http;
 use hyper;
 use hyper_tls::HttpsConnector;
-use http;
 use tokio_core::reactor::Handle;
-use error::{Error, Result};
-use super::{Host, HORIZON_TEST_URI, HORIZON_URI};
 
 /// A client that can issue requests to a horizon api.
 #[derive(Debug, Clone)]

client/src/client/sync/iter.rs

@@ -1,8 +1,8 @@
-use endpoint::{IntoRequest, Records};
-use uri::TryFromUri;
-use serde::de::DeserializeOwned;
 use super::Client;
+use endpoint::{IntoRequest, Records};
 use error::Result;
+use serde::de::DeserializeOwned;
+use uri::TryFromUri;
 
 /// An iterator for records. Provides the ability to use the iterator
 /// in rust against records that are returned from the api.

client/src/client/sync/mod.rs

@@ -13,12 +13,12 @@
 //! let client = Client::new("https://horizon-testnet.stellar.org").unwrap();
 //! ```
 
-use reqwest;
-use http::{self, Uri};
-use error::{Error, Result};
-use endpoint::IntoRequest;
 use super::{Host, HORIZON_TEST_URI, HORIZON_URI};
 use StellarError;
+use endpoint::IntoRequest;
+use error::{Error, Result};
+use http::{self, Uri};
+use reqwest;
 use serde_json;
 
 mod iter;

client/src/endpoint/account.rs

@@ -1,9 +1,9 @@
 //! Contains endpoints for accessing accounts and related information.
-use error::Result;
-use std::str::FromStr;
-use resources::{Account, Datum, Effect, Offer, Operation, Transaction};
 use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
+use error::Result;
 use http::{Request, Uri};
+use resources::{Account, Datum, Effect, Offer, Operation, Transaction};
+use std::str::FromStr;
 use uri::{self, TryFromUri, UriWrap};
 
 /// Represents the account details on the stellar horizon server.

client/src/endpoint/asset.rs

@@ -1,9 +1,9 @@
 //! Contains endpoints for assets and related information to specific assets.
-use error::Result;
-use std::str::FromStr;
-use resources::Asset;
 use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
+use error::Result;
 use http::{Request, Uri};
+use resources::Asset;
+use std::str::FromStr;
 use uri::{self, TryFromUri, UriWrap};
 
 /// Represents the all assets end point for the stellar horizon server. The endpoint

client/src/endpoint/cursor.rs

@@ -35,7 +35,7 @@ macro_rules! impl_cursor {
                 self.cursor.as_ref().map(|s| &**s)
             }
         }
-    }
+    };
 }
 
 #[cfg(test)]

client/src/endpoint/effect.rs

@@ -1,15 +1,15 @@
 //! Contains the endpoint for all effects.
-use error::Result;
-use std::str::FromStr;
-use resources::Effect;
 use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
+use error::Result;
 use http::{Request, Uri};
+use resources::Effect;
+use std::str::FromStr;
 use uri::{self, TryFromUri, UriWrap};
 
 pub use super::account::Effects as ForAccount;
 pub use super::ledger::Effects as ForLedger;
-pub use super::transaction::Effects as ForTransaction;
 pub use super::operation::Effects as ForOperation;
+pub use super::transaction::Effects as ForTransaction;
 
 /// This endpoint represents all effects that have resulted from successful opreations in Stellar.
 /// The endpoint will return all effects and accepts query params for a cursor, order, and limit.

client/src/endpoint/ledger.rs

@@ -1,9 +1,9 @@
 //! Contains the endpoint for all ledgers.
+use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
 use error::Result;
 use http::{Request, Uri};
-use std::str::FromStr;
 use resources::{Effect, Ledger, Operation, Transaction};
-use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
+use std::str::FromStr;
 use uri::{self, TryFromUri, UriWrap};
 
 /// Represents the all ledgers end point for the stellar horizon server. The endpoint

client/src/endpoint/limit.rs

@@ -27,7 +27,7 @@ macro_rules! impl_limit {
                 self.limit
             }
         }
-    }
+    };
 }
 
 #[cfg(test)]

client/src/endpoint/mod.rs

@@ -18,8 +18,8 @@
 //! let all_txns = client.request(txns).unwrap();
 //! ```
 use error::Result;
-use serde::de::DeserializeOwned;
 use http;
+use serde::de::DeserializeOwned;
 
 #[macro_use]
 mod cursor;
@@ -42,8 +42,8 @@ pub mod transaction;
 
 pub use self::cursor::Cursor;
 pub use self::limit::Limit;
-pub use self::records::Records;
 pub use self::order::{Direction, Order, ParseDirectionError};
+pub use self::records::Records;
 
 /// Represents the body of a request to an IntoRequest.
 #[derive(Debug)]

client/src/endpoint/operation.rs

@@ -1,9 +1,9 @@
 //! Contains the endpoint for all operations.
+use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
 use error::Result;
 use http::{Request, Uri};
-use std::str::FromStr;
 use resources::{Effect, Operation};
-use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
+use std::str::FromStr;
 use uri::{self, TryFromUri, UriWrap};
 
 pub use super::account::Operations as ForAccount;

client/src/endpoint/order.rs

@@ -33,7 +33,7 @@ macro_rules! impl_order {
                 self.order
             }
         }
-    }
+    };
 }
 
 /// The order to return results in.

client/src/endpoint/orderbook.rs

@@ -1,9 +1,9 @@
 //! Contains the endpoint for fetching the orderbook for a given asset pair
-use error::Result;
-use std::str::FromStr;
-use resources::{AssetIdentifier, Orderbook};
 use super::{Body, IntoRequest, Limit};
+use error::Result;
 use http::{Request, Uri};
+use resources::{AssetIdentifier, Orderbook};
+use std::str::FromStr;
 
 /// Given an asset pair, the endpoint will return all bids and asks with an optional
 /// limit parameter to cap the number of records returned.

client/src/endpoint/payment.rs

@@ -1,14 +1,14 @@
 //! Contains the endpoint for all payment operations.
+use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
 use error::Result;
 use http::{Request, Uri};
-use std::str::FromStr;
 use resources::{Amount, AssetIdentifier, Operation, PaymentPath};
-use super::{Body, Cursor, Direction, IntoRequest, Limit, Order, Records};
+use std::str::FromStr;
 use uri::{self, TryFromUri, UriWrap};
 
-pub use super::transaction::Payments as ForTransaction;
-pub use super::ledger::Payments as ForLedger;
 pub use super::account::Payments as ForAccount;
+pub use super::ledger::Payments as ForLedger;
+pub use super::transaction::Payments as ForTransaction;
 
 /// This endpoint represents all payment operations that are part of validated transactions.
 /// The endpoint will return all payments and accepts query params for a cursor, order, and limit.