Support Rust 2018 edition

Builds on Rust 1.31

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"

src/app.rs

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

src/bulk.rs

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

src/config.rs

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

src/daemon.rs

@@ -15,11 +15,10 @@ use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-use metrics::{HistogramOpts, HistogramVec, Metrics};
+use crate::errors::*;
-use signal::Waiter;
+use crate::metrics::{HistogramOpts, HistogramVec, Metrics};
-use util::HeaderList;
+use crate::signal::Waiter;
-
+use crate::util::HeaderList;
-use 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 crate::store::{ReadStore, Row, WriteStore};
-use util::Bytes;
+use crate::util::Bytes;
 
 pub struct FakeStore;
 
@@ -21,8 +21,8 @@ impl WriteStore for FakeStore {
 mod tests {
     #[test]
     fn test_fakestore() {
-        use fake;
+        use crate::fake;
-        use store::{ReadStore, Row, WriteStore};
+        use crate::store::{ReadStore, Row, WriteStore};
 
         let store = fake::FakeStore {};
         store.write(vec![Row {

src/index.rs

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

src/lib.rs

@@ -1,25 +1,5 @@
 #![recursion_limit = "1024"]
 
-extern crate base64;
-extern crate bincode;
-extern crate bitcoin;
-extern crate chan_signal;
-extern crate crypto;
-extern crate dirs;
-extern crate glob;
-extern crate hex;
-extern crate libc;
-extern crate lru;
-extern crate num_cpus;
-extern crate page_size;
-extern crate prometheus;
-extern crate rocksdb;
-extern crate serde;
-extern crate stderrlog;
-extern crate sysconf;
-extern crate time;
-extern crate tiny_http;
-
 #[macro_use]
 extern crate chan;
 #[macro_use]

src/mempool.rs

@@ -6,13 +6,14 @@ use std::iter::FromIterator;
 use std::ops::Bound;
 use std::sync::Mutex;
 
-use daemon::{Daemon, MempoolEntry};
+use crate::daemon::{Daemon, MempoolEntry};
-use index::index_transaction;
+use crate::errors::*;
-use metrics::{Gauge, GaugeVec, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics};
+use crate::index::index_transaction;
-use store::{ReadStore, Row};
+use crate::metrics::{
-use util::Bytes;
+    Gauge, GaugeVec, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics,
-
+};
-use errors::*;
+use crate::store::{ReadStore, Row};
+use crate::util::Bytes;
 
 const VSIZE_BIN_WIDTH: u32 = 100_000; // in vbytes
 

src/metrics.rs

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

src/notify.rs

@@ -11,7 +11,7 @@ use std::sync::mpsc::Sender;
 use std::thread;
 use std::time::Duration;
 
-use util;
+use crate::util;
 
 fn connect() -> Result<Socket, Error> {
     let mut sock = Socket::new(Network::Bitcoin);

src/query.rs

@@ -4,18 +4,17 @@ use bitcoin::util::hash::Sha256dHash;
 use crypto::digest::Digest;
 use crypto::sha2::Sha256;
 use lru::LruCache;
+use serde_json::Value;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex, RwLock};
 
-use app::App;
+use crate::app::App;
-use index::{compute_script_hash, TxInRow, TxOutRow, TxRow};
+use crate::errors::*;
-use mempool::Tracker;
+use crate::index::{compute_script_hash, TxInRow, TxOutRow, TxRow};
-use metrics::Metrics;
+use crate::mempool::Tracker;
-use serde_json::Value;
+use crate::metrics::Metrics;
-use store::{ReadStore, Row};
+use crate::store::{ReadStore, Row};
-use util::{FullHash, HashPrefix, HeaderEntry};
+use crate::util::{FullHash, HashPrefix, HeaderEntry};
-
-use errors::*;
 
 pub struct FundingOutput {
     pub txn_id: Sha256dHash,

src/rpc.rs

@@ -13,12 +13,11 @@ use std::sync::mpsc::{Sender, SyncSender, TrySendError};
 use std::sync::{Arc, Mutex};
 use std::thread;
 
-use index::compute_script_hash;
+use crate::errors::*;
-use metrics::{Gauge, HistogramOpts, HistogramVec, MetricOpts, Metrics};
+use crate::index::compute_script_hash;
-use query::{Query, Status};
+use crate::metrics::{Gauge, HistogramOpts, HistogramVec, MetricOpts, Metrics};
-use util::{spawn_thread, Channel, HeaderEntry, SyncChannel};
+use crate::query::{Query, Status};
-
+use crate::util::{spawn_thread, Channel, HeaderEntry, SyncChannel};
-use errors::*;
 
 // TODO: Sha256dHash should be a generic hash-container (since script hash is single SHA256)
 fn hash_from_value(val: Option<&Value>) -> Result<Sha256dHash> {

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

@@ -1,8 +1,7 @@
 use rocksdb;
-
 use std::path::{Path, PathBuf};
 
-use util::Bytes;
+use crate::util::Bytes;
 
 #[derive(Clone)]
 pub struct Row {