From bcdb058492da86ff736d40477d2bcf353d93c714 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 11 May 2018 13:06:05 -0600 Subject: [PATCH] cargo fmt --- src/accountant.rs | 2 +- src/bin/testnode.rs | 2 +- src/ecdsa.rs | 2 +- src/hash.rs | 2 +- src/historian.rs | 2 +- src/mint.rs | 2 +- src/result.rs | 2 +- src/streamer.rs | 2 +- src/tpu.rs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/accountant.rs b/src/accountant.rs index f1e678ca2..7409a6fb5 100644 --- a/src/accountant.rs +++ b/src/accountant.rs @@ -16,8 +16,8 @@ use signature::{KeyPair, PublicKey, Signature}; use std::collections::hash_map::Entry::Occupied; use std::collections::{HashMap, HashSet, VecDeque}; use std::result; -use std::sync::atomic::{AtomicIsize, Ordering}; use std::sync::RwLock; +use std::sync::atomic::{AtomicIsize, Ordering}; use transaction::Transaction; pub const MAX_ENTRY_IDS: usize = 1024 * 4; diff --git a/src/bin/testnode.rs b/src/bin/testnode.rs index 1c97043c3..0eb38e195 100644 --- a/src/bin/testnode.rs +++ b/src/bin/testnode.rs @@ -17,8 +17,8 @@ use std::env; use std::io::{stdin, stdout, Read}; use std::net::UdpSocket; use std::process::exit; -use std::sync::atomic::AtomicBool; use std::sync::Arc; +use std::sync::atomic::AtomicBool; fn print_usage(program: &str, opts: Options) { let mut brief = format!("Usage: cat | {} [options]\n\n", program); diff --git a/src/ecdsa.rs b/src/ecdsa.rs index 121430213..ea10be947 100644 --- a/src/ecdsa.rs +++ b/src/ecdsa.rs @@ -139,8 +139,8 @@ mod tests { use packet::{Packet, Packets, SharedPackets}; use std::sync::RwLock; use thin_client_service::Request; - use transaction::test_tx; use transaction::Transaction; + use transaction::test_tx; fn make_packet_from_transaction(tr: Transaction) -> Packet { let tx = serialize(&Request::Transaction(tr)).unwrap(); diff --git a/src/hash.rs b/src/hash.rs index 61dd01468..ee7598a0d 100644 --- a/src/hash.rs +++ b/src/hash.rs @@ -1,7 +1,7 @@ //! The `hash` module provides functions for creating SHA-256 hashes. -use generic_array::typenum::U32; use generic_array::GenericArray; +use generic_array::typenum::U32; use sha2::{Digest, Sha256}; pub type Hash = GenericArray; diff --git a/src/historian.rs b/src/historian.rs index 7a183c155..351fca9c0 100644 --- a/src/historian.rs +++ b/src/historian.rs @@ -4,8 +4,8 @@ use entry::Entry; use hash::Hash; use recorder::{ExitReason, Recorder, Signal}; -use std::sync::mpsc::{channel, Receiver, Sender, TryRecvError}; use std::sync::Mutex; +use std::sync::mpsc::{channel, Receiver, Sender, TryRecvError}; use std::thread::{spawn, JoinHandle}; use std::time::Instant; diff --git a/src/mint.rs b/src/mint.rs index 52a685e3e..2b7f484fb 100644 --- a/src/mint.rs +++ b/src/mint.rs @@ -1,7 +1,7 @@ //! The `mint` module is a library for generating the chain's genesis block. -use entry::create_entry; use entry::Entry; +use entry::create_entry; use event::Event; use hash::{hash, Hash}; use ring::rand::SystemRandom; diff --git a/src/result.rs b/src/result.rs index d2cb485ad..fca876ebe 100644 --- a/src/result.rs +++ b/src/result.rs @@ -78,9 +78,9 @@ mod tests { use std::io; use std::io::Write; use std::net::SocketAddr; - use std::sync::mpsc::channel; use std::sync::mpsc::RecvError; use std::sync::mpsc::RecvTimeoutError; + use std::sync::mpsc::channel; use std::thread; fn addr_parse_error() -> Result { diff --git a/src/streamer.rs b/src/streamer.rs index d551a890e..77aab25dc 100644 --- a/src/streamer.rs +++ b/src/streamer.rs @@ -463,8 +463,8 @@ mod test { use std::sync::{Arc, RwLock}; use std::thread::sleep; use std::time::Duration; - use streamer::{blob_receiver, receiver, responder, retransmitter, window}; use streamer::{BlobReceiver, PacketReceiver}; + use streamer::{blob_receiver, receiver, responder, retransmitter, window}; fn get_msgs(r: PacketReceiver, num: &mut usize) { for _t in 0..5 { diff --git a/src/tpu.rs b/src/tpu.rs index bb3fce0e0..95bfbc48a 100644 --- a/src/tpu.rs +++ b/src/tpu.rs @@ -12,8 +12,8 @@ use rand::{thread_rng, Rng}; use result::Result; use serde_json; use std::collections::VecDeque; -use std::io::sink; use std::io::Write; +use std::io::sink; use std::net::UdpSocket; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::{channel, Sender};