Revert "Update formatting following Rust 1.27 update"

This reverts commit 7372f8e239.

examples/bench_index.rs

@@ -1,10 +1,14 @@
 extern crate electrs;
 extern crate error_chain;
 
-use electrs::{
+use electrs::{config::Config,
-    config::Config, daemon::Daemon, errors::*, index, metrics::Metrics, parse::Parser,
+              daemon::Daemon,
-    signal::Waiter, store::{ReadStore, Row, WriteStore}, util::Bytes,
+              errors::*,
-};
+              index::Index,
+              metrics::Metrics,
+              signal::Waiter,
+              store::{ReadStore, Row, WriteStore},
+              util::Bytes};
 use error_chain::ChainedError;
 
 struct FakeStore;

src/bin/electrs.rs

@@ -4,10 +4,16 @@ extern crate error_chain;
 use error_chain::ChainedError;
 use std::time::Duration;
 
-use electrs::{
+use electrs::{app::App,
-    app::App, config::Config, daemon::Daemon, errors::*, index::Index, metrics::Metrics,
+              config::Config,
-    query::Query, rpc::RPC, signal::Waiter, store::{DBStore, StoreOptions},
+              daemon::Daemon,
-};
+              errors::*,
+              index::Index,
+              metrics::Metrics,
+              query::Query,
+              rpc::RPC,
+              signal::Waiter,
+              store::{DBStore, StoreOptions}};
 
 fn run_server(config: &Config) -> Result<()> {
     let signal = Waiter::new();

src/index.rs

@@ -14,10 +14,8 @@ use daemon::Daemon;
 use metrics::{Counter, Gauge, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics};
 use signal::Waiter;
 use store::{ReadStore, Row, WriteStore};
-use util::{
+use util::{full_hash, hash_prefix, spawn_thread, Bytes, FullHash, HashPrefix, HeaderEntry,
-    full_hash, hash_prefix, spawn_thread, Bytes, FullHash, HashPrefix, HeaderEntry, HeaderList,
+           HeaderList, HeaderMap, SyncChannel, HASH_PREFIX_LEN};
-    HeaderMap, SyncChannel, HASH_PREFIX_LEN,
-};
 
 use errors::*;
 

src/metrics.rs

@@ -3,10 +3,8 @@ use std::io;
 use std::net::SocketAddr;
 use tiny_http;
 
-pub use prometheus::{
+pub use prometheus::{GaugeVec, HistogramOpts, HistogramTimer, HistogramVec, IntCounter as Counter,
-    GaugeVec, HistogramOpts, HistogramTimer, HistogramVec, IntCounter as Counter,
+                     IntGauge as Gauge, Opts as MetricOpts};
-    IntGauge as Gauge, Opts as MetricOpts,
-};
 
 use util::spawn_thread;