Update the source code for Rust 2018

Using `cargo fix --release`.

Cargo.toml

@@ -9,6 +9,7 @@ repository = "https://github.com/romanz/electrs"
 keywords = ["bitcoin", "electrum", "server", "index", "database"]
 documentation = "https://docs.rs/electrs/"
 readme = "README.md"
+edition = "2018"
 
 [dependencies]
 arrayref = "0.3"

doc/usage.md

@@ -1,6 +1,6 @@
 ## Installation
 
-Install [latest Rust](https://rustup.rs/) (1.28+),
+Install [latest Rust](https://rustup.rs/) (1.31+),
 [latest Bitcoin Core](https://bitcoincore.org/en/download/) (0.16+)
 and [latest Electrum wallet](https://electrum.org/#download) (3.2+).
 

src/app.rs

@@ -1,9 +1,9 @@
 use bitcoin::util::hash::Sha256dHash;
 use std::sync::{Arc, Mutex};
 
-use {daemon, index, signal::Waiter, store};
+use crate::{daemon, index, signal::Waiter, store};
 
-use errors::*;
+use crate::errors::*;
 
 pub struct App {
     store: store::DBStore,

src/bulk.rs

@@ -12,14 +12,14 @@ use std::sync::{
 };
 use std::thread;
 
-use config::Config;
-use daemon::Daemon;
-use index::{index_block, last_indexed_block, read_indexed_blockhashes};
-use metrics::{CounterVec, Histogram, HistogramOpts, HistogramVec, MetricOpts, Metrics};
-use store::{DBStore, Row, WriteStore};
-use util::{spawn_thread, HeaderList, SyncChannel};
+use crate::config::Config;
+use crate::daemon::Daemon;
+use crate::index::{index_block, last_indexed_block, read_indexed_blockhashes};
+use crate::metrics::{CounterVec, Histogram, HistogramOpts, HistogramVec, MetricOpts, Metrics};
+use crate::store::{DBStore, Row, WriteStore};
+use crate::util::{spawn_thread, HeaderList, SyncChannel};
 
-use errors::*;
+use crate::errors::*;
 
 struct Parser {
     magic: u32,

src/config.rs

@@ -8,9 +8,9 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use stderrlog;
 
-use daemon::CookieGetter;
+use crate::daemon::CookieGetter;
 
-use errors::*;
+use crate::errors::*;
 
 #[derive(Debug, Clone)]
 pub struct Config {

src/daemon.rs

@@ -15,11 +15,11 @@ use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-use metrics::{HistogramOpts, HistogramVec, Metrics};
-use signal::Waiter;
-use util::HeaderList;
+use crate::metrics::{HistogramOpts, HistogramVec, Metrics};
+use crate::signal::Waiter;
+use crate::util::HeaderList;
 
-use errors::*;
+use crate::errors::*;
 
 fn parse_hash(value: &Value) -> Result<Sha256dHash> {
     Ok(Sha256dHash::from_hex(

src/fake.rs

@@ -1,5 +1,5 @@
-use store::{ReadStore, Row, WriteStore};
-use util::Bytes;
+use crate::store::{ReadStore, Row, WriteStore};
+use crate::util::Bytes;
 
 pub struct FakeStore;
 
@@ -21,8 +21,8 @@ impl WriteStore for FakeStore {
 mod tests {
     #[test]
     fn test_fakestore() {
-        use fake;
-        use store::{ReadStore, Row, WriteStore};
+        use crate::fake;
+        use crate::store::{ReadStore, Row, WriteStore};
 
         let store = fake::FakeStore {};
         store.write(vec![Row {

src/index.rs

@@ -10,18 +10,20 @@ use std::collections::{HashMap, HashSet};
 use std::iter::FromIterator;
 use std::sync::RwLock;
 
-use daemon::Daemon;
-use metrics::{Counter, Gauge, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics};
-use signal::Waiter;
-use store::{ReadStore, Row, WriteStore};
-use util::{
+use crate::daemon::Daemon;
+use crate::metrics::{
+    Counter, Gauge, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics,
+};
+use crate::signal::Waiter;
+use crate::store::{ReadStore, Row, WriteStore};
+use crate::util::{
     full_hash, hash_prefix, spawn_thread, BlockMeta, Bytes, FullHash, HashPrefix, HeaderEntry,
     HeaderList, HeaderMap, SyncChannel, HASH_PREFIX_LEN,
 };
 
-use config::Config;
+use crate::config::Config;
 
-use errors::*;
+use crate::errors::*;
 
 #[derive(Serialize, Deserialize)]
 pub struct TxInKey {

src/metrics.rs

@@ -13,9 +13,9 @@ pub use prometheus::{
     IntCounterVec as CounterVec, IntGauge as Gauge, Opts as MetricOpts,
 };
 
-use util::spawn_thread;
+use crate::util::spawn_thread;
 
-use errors::*;
+use crate::errors::*;
 
 pub struct Metrics {
     reg: prometheus::Registry,

src/new_index.rs

@@ -26,9 +26,9 @@ use std::thread;
 // use daemon::Daemon;
 // use metrics::{Counter, Gauge, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics};
 // use signal::Waiter;
-use daemon::Daemon;
-use errors::*;
-use util::{spawn_thread, Bytes, HeaderEntry, HeaderList, SyncChannel};
+use crate::daemon::Daemon;
+use crate::errors::*;
+use crate::util::{spawn_thread, Bytes, HeaderEntry, HeaderList, SyncChannel};
 
 // use config::Config;
 

src/signal.rs

@@ -2,7 +2,7 @@ use chan;
 use chan_signal;
 use std::time::Duration;
 
-use errors::*;
+use crate::errors::*;
 
 #[derive(Clone)] // so multiple threads could wait on signals
 pub struct Waiter {

src/store.rs

@@ -3,8 +3,8 @@ use rocksdb;
 
 use std::path::{Path, PathBuf};
 
-use config::Config;
-use util::Bytes;
+use crate::config::Config;
+use crate::util::Bytes;
 
 const DB_VERSION: u32 = 1;
 

src/util.rs

@@ -1,7 +1,7 @@
+use crate::errors::*;
 use bitcoin::blockdata::block::{Block, BlockHeader};
 use bitcoin::consensus::encode::serialize;
 use bitcoin::util::hash::{BitcoinHash, Sha256dHash};
-use errors::*;
 use std::collections::HashMap;
 use std::fmt;
 use std::iter::FromIterator;