From b7641fce50f7f59f30cb32c19efd42b2b1c3d41f Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Thu, 12 Apr 2018 22:51:00 +0200
Subject: [PATCH] comply to last fmt version
---
crypto/keys/ed25519.rs | 2 +-
crypto/keys/mod.rs | 2 +-
crypto/lib.rs | 8 +++++---
documents/blockchain/mod.rs | 2 +-
documents/blockchain/v10/documents/block.rs | 16 ++++++++--------
.../blockchain/v10/documents/certification.rs | 8 ++++----
documents/blockchain/v10/documents/identity.rs | 8 ++++----
documents/blockchain/v10/documents/membership.rs | 8 ++++----
documents/blockchain/v10/documents/mod.rs | 16 ++++++++--------
documents/blockchain/v10/documents/revocation.rs | 8 ++++----
.../blockchain/v10/documents/transaction.rs | 8 ++++----
documents/lib.rs | 8 +++++---
wotb/legacy.rs | 12 ++++++------
wotb/lib.rs | 10 ++++++----
wotb/rusty.rs | 8 ++++----
15 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/crypto/keys/ed25519.rs b/crypto/keys/ed25519.rs
index ff9d8c0e..0446123d 100644
--- a/crypto/keys/ed25519.rs
+++ b/crypto/keys/ed25519.rs
@@ -20,10 +20,10 @@
//! [`KeyPairGenerator`]: struct.KeyPairGenerator.html
use std::collections::hash_map::DefaultHasher;
+use std::fmt::Debug;
use std::fmt::Display;
use std::fmt::Error;
use std::fmt::Formatter;
-use std::fmt::Debug;
use std::hash::{Hash, Hasher};
use base58::{FromBase58, FromBase58Error, ToBase58};
diff --git a/crypto/keys/mod.rs b/crypto/keys/mod.rs
index 3797503e..d5e93c41 100644
--- a/crypto/keys/mod.rs
+++ b/crypto/keys/mod.rs
@@ -46,8 +46,8 @@
//! `ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/`
//! with `=` as padding character.
-use std::fmt::Display;
use std::fmt::Debug;
+use std::fmt::Display;
use std::hash::Hash;
use base58::ToBase58;
diff --git a/crypto/lib.rs b/crypto/lib.rs
index fc0ac35e..2b9b8d18 100644
--- a/crypto/lib.rs
+++ b/crypto/lib.rs
@@ -16,9 +16,11 @@
//! Provide wrappers for cryptographic building blocks used by Duniter.
#![cfg_attr(feature = "strict", deny(warnings))]
-#![deny(missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
- trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
- unused_qualifications)]
+#![deny(
+ missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
+ trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
+ unused_qualifications
+)]
extern crate base58;
extern crate base64;
diff --git a/documents/blockchain/mod.rs b/documents/blockchain/mod.rs
index 10b092cb..dee4005a 100644
--- a/documents/blockchain/mod.rs
+++ b/documents/blockchain/mod.rs
@@ -138,7 +138,7 @@ pub trait DocumentParser<S, D, E> {
#[cfg(test)]
mod tests {
use super::*;
- use duniter_crypto::keys::{Signature, ed25519};
+ use duniter_crypto::keys::{ed25519, Signature};
// simple text document for signature testing
#[derive(Debug, Clone)]
diff --git a/documents/blockchain/v10/documents/block.rs b/documents/blockchain/v10/documents/block.rs
index 19a01f56..68fed87f 100644
--- a/documents/blockchain/v10/documents/block.rs
+++ b/documents/blockchain/v10/documents/block.rs
@@ -17,16 +17,16 @@
use crypto::digest::Digest;
use crypto::sha2::Sha256;
-use duniter_crypto::keys::{PrivateKey, ed25519};
+use duniter_crypto::keys::{ed25519, PrivateKey};
-use {BlockHash, BlockId, Blockstamp, Hash};
-use blockchain::{BlockchainProtocol, Document, IntoSpecializedDocument};
-use blockchain::v10::documents::{TextDocument, V10Document};
+use blockchain::v10::documents::certification::CertificationDocument;
use blockchain::v10::documents::identity::IdentityDocument;
use blockchain::v10::documents::membership::MembershipDocument;
-use blockchain::v10::documents::certification::CertificationDocument;
use blockchain::v10::documents::revocation::RevocationDocument;
use blockchain::v10::documents::transaction::TransactionDocument;
+use blockchain::v10::documents::{TextDocument, V10Document};
+use blockchain::{BlockchainProtocol, Document, IntoSpecializedDocument};
+use {BlockHash, BlockId, Blockstamp, Hash};
/// Currency parameters
#[derive(Debug, Copy, Clone, PartialEq)]
@@ -324,10 +324,10 @@ impl IntoSpecializedDocument<BlockchainProtocol> for BlockDocument {
#[cfg(test)]
mod tests {
use super::*;
- use std::ops::Deref;
- use duniter_crypto::keys::{PublicKey, Signature};
- use blockchain::{Document, DocumentParser, VerificationResult};
use blockchain::v10::documents::V10DocumentParser;
+ use blockchain::{Document, DocumentParser, VerificationResult};
+ use duniter_crypto::keys::{PublicKey, Signature};
+ use std::ops::Deref;
#[test]
fn generate_and_verify_empty_block() {
diff --git a/documents/blockchain/v10/documents/certification.rs b/documents/blockchain/v10/documents/certification.rs
index 6c0e3c0f..47ee1365 100644
--- a/documents/blockchain/v10/documents/certification.rs
+++ b/documents/blockchain/v10/documents/certification.rs
@@ -15,13 +15,13 @@
//! Wrappers around Certification documents.
-use duniter_crypto::keys::{PublicKey, Signature, ed25519};
+use duniter_crypto::keys::{ed25519, PublicKey, Signature};
use regex::Regex;
-use Blockstamp;
-use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
use blockchain::v10::documents::{StandardTextDocumentParser, TextDocument, TextDocumentBuilder,
V10Document, V10DocumentParsingError};
+use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
+use Blockstamp;
lazy_static! {
static ref CERTIFICATION_REGEX: Regex = Regex::new(
@@ -255,8 +255,8 @@ impl StandardTextDocumentParser for CertificationDocumentParser {
#[cfg(test)]
mod tests {
use super::*;
- use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
use blockchain::VerificationResult;
+ use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
#[test]
fn generate_real_document() {
diff --git a/documents/blockchain/v10/documents/identity.rs b/documents/blockchain/v10/documents/identity.rs
index cf40450c..9eb94177 100644
--- a/documents/blockchain/v10/documents/identity.rs
+++ b/documents/blockchain/v10/documents/identity.rs
@@ -15,13 +15,13 @@
//! Wrappers around Identity documents.
-use duniter_crypto::keys::{PublicKey, ed25519};
+use duniter_crypto::keys::{ed25519, PublicKey};
use regex::Regex;
-use Blockstamp;
-use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
use blockchain::v10::documents::{StandardTextDocumentParser, TextDocument, TextDocumentBuilder,
V10Document, V10DocumentParsingError};
+use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
+use Blockstamp;
lazy_static! {
static ref IDENTITY_REGEX: Regex = Regex::new(
@@ -208,8 +208,8 @@ impl StandardTextDocumentParser for IdentityDocumentParser {
#[cfg(test)]
mod tests {
use super::*;
- use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
use blockchain::{Document, VerificationResult};
+ use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
#[test]
fn generate_real_document() {
diff --git a/documents/blockchain/v10/documents/membership.rs b/documents/blockchain/v10/documents/membership.rs
index b8e5652b..f56937b2 100644
--- a/documents/blockchain/v10/documents/membership.rs
+++ b/documents/blockchain/v10/documents/membership.rs
@@ -15,13 +15,13 @@
//! Wrappers around Membership documents.
-use duniter_crypto::keys::{PublicKey, ed25519};
+use duniter_crypto::keys::{ed25519, PublicKey};
use regex::Regex;
-use Blockstamp;
-use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
use blockchain::v10::documents::{StandardTextDocumentParser, TextDocument, TextDocumentBuilder,
V10Document, V10DocumentParsingError};
+use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
+use Blockstamp;
lazy_static! {
static ref MEMBERSHIP_REGEX: Regex = Regex::new(
@@ -255,8 +255,8 @@ impl StandardTextDocumentParser for MembershipDocumentParser {
#[cfg(test)]
mod tests {
use super::*;
- use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
use blockchain::VerificationResult;
+ use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
#[test]
fn generate_real_document() {
diff --git a/documents/blockchain/v10/documents/mod.rs b/documents/blockchain/v10/documents/mod.rs
index 90d8fd78..bf8658d5 100644
--- a/documents/blockchain/v10/documents/mod.rs
+++ b/documents/blockchain/v10/documents/mod.rs
@@ -19,26 +19,26 @@ extern crate crypto;
use self::crypto::digest::Digest;
-use duniter_crypto::keys::{Signature, ed25519};
-use regex::Regex;
-use blockchain::{Document, DocumentBuilder, DocumentParser};
use blockchain::v10::documents::identity::IdentityDocumentParser;
+use blockchain::{Document, DocumentBuilder, DocumentParser};
+use duniter_crypto::keys::{ed25519, Signature};
+use regex::Regex;
+pub mod block;
+pub mod certification;
pub mod identity;
pub mod membership;
-pub mod certification;
pub mod revocation;
pub mod transaction;
-pub mod block;
-pub use blockchain::v10::documents::identity::{IdentityDocument, IdentityDocumentBuilder};
-pub use blockchain::v10::documents::membership::{MembershipDocument, MembershipDocumentParser};
+pub use blockchain::v10::documents::block::BlockDocument;
pub use blockchain::v10::documents::certification::{CertificationDocument,
CertificationDocumentParser};
+pub use blockchain::v10::documents::identity::{IdentityDocument, IdentityDocumentBuilder};
+pub use blockchain::v10::documents::membership::{MembershipDocument, MembershipDocumentParser};
pub use blockchain::v10::documents::revocation::{RevocationDocument, RevocationDocumentParser};
pub use blockchain::v10::documents::transaction::{TransactionDocument, TransactionDocumentBuilder,
TransactionDocumentParser};
-pub use blockchain::v10::documents::block::BlockDocument;
// Use of lazy_static so the regex is only compiled at first use.
lazy_static! {
diff --git a/documents/blockchain/v10/documents/revocation.rs b/documents/blockchain/v10/documents/revocation.rs
index 43b58913..7568a355 100644
--- a/documents/blockchain/v10/documents/revocation.rs
+++ b/documents/blockchain/v10/documents/revocation.rs
@@ -15,13 +15,13 @@
//! Wrappers around Revocation documents.
-use duniter_crypto::keys::{PublicKey, Signature, ed25519};
+use duniter_crypto::keys::{ed25519, PublicKey, Signature};
use regex::Regex;
-use Blockstamp;
-use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
use blockchain::v10::documents::{StandardTextDocumentParser, TextDocument, TextDocumentBuilder,
V10Document, V10DocumentParsingError};
+use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
+use Blockstamp;
lazy_static! {
static ref REVOCATION_REGEX: Regex = Regex::new(
@@ -219,8 +219,8 @@ impl StandardTextDocumentParser for RevocationDocumentParser {
#[cfg(test)]
mod tests {
use super::*;
- use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
use blockchain::VerificationResult;
+ use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
#[test]
fn generate_real_document() {
diff --git a/documents/blockchain/v10/documents/transaction.rs b/documents/blockchain/v10/documents/transaction.rs
index 4ec453d2..5d579a88 100644
--- a/documents/blockchain/v10/documents/transaction.rs
+++ b/documents/blockchain/v10/documents/transaction.rs
@@ -17,14 +17,14 @@
use std::ops::Deref;
-use duniter_crypto::keys::{PublicKey, ed25519};
+use duniter_crypto::keys::{ed25519, PublicKey};
use regex::Regex;
use regex::RegexBuilder;
-use Blockstamp;
-use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
use blockchain::v10::documents::{StandardTextDocumentParser, TextDocument, TextDocumentBuilder,
V10Document, V10DocumentParsingError};
+use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument};
+use Blockstamp;
lazy_static! {
static ref TRANSACTION_REGEX_SIZE: &'static usize = &40_000_000;
@@ -658,8 +658,8 @@ impl StandardTextDocumentParser for TransactionDocumentParser {
#[cfg(test)]
mod tests {
use super::*;
- use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
use blockchain::{Document, VerificationResult};
+ use duniter_crypto::keys::{PrivateKey, PublicKey, Signature};
#[test]
fn generate_real_document() {
diff --git a/documents/lib.rs b/documents/lib.rs
index 702879a4..7b360c1b 100644
--- a/documents/lib.rs
+++ b/documents/lib.rs
@@ -16,9 +16,11 @@
//! Implements the Duniter Documents Protocol.
#![cfg_attr(feature = "strict", deny(warnings))]
-#![deny(missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
- trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
- unused_qualifications)]
+#![deny(
+ missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
+ trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
+ unused_qualifications
+)]
extern crate base58;
extern crate base64;
diff --git a/wotb/legacy.rs b/wotb/legacy.rs
index 402288a3..47da7fdf 100644
--- a/wotb/legacy.rs
+++ b/wotb/legacy.rs
@@ -16,21 +16,21 @@
//! Provide a legacy implementation of `WebOfTrust` storage and calculations.
//! Its mostly translated directly from the original C++ code.
-use WotDistance;
-use std::collections::HashSet;
use std::collections::hash_set::Iter;
-use std::rc::Rc;
+use std::collections::HashSet;
use std::fs::File;
use std::io::prelude::*;
+use std::rc::Rc;
+use WotDistance;
use bincode::{deserialize, serialize, Infinite};
use HasLinkResult;
-use WotDistanceParameters;
-use WebOfTrust;
-use RemLinkResult;
use NewLinkResult;
use NodeId;
+use RemLinkResult;
+use WebOfTrust;
+use WotDistanceParameters;
#[derive(Debug, Clone, Serialize, Deserialize)]
struct Node {
diff --git a/wotb/lib.rs b/wotb/lib.rs
index 21767540..5a388cf2 100644
--- a/wotb/lib.rs
+++ b/wotb/lib.rs
@@ -27,9 +27,11 @@
//! [js-tests]: https://github.com/duniter/wotb/blob/master/wotcpp/webOfTrust.cpp
#![cfg_attr(feature = "strict", deny(warnings))]
-#![deny(missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
- trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
- unused_qualifications)]
+#![deny(
+ missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
+ trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
+ unused_qualifications
+)]
extern crate bincode;
extern crate byteorder;
@@ -45,9 +47,9 @@ pub use legacy::LegacyWebOfTrust;
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use std::io::prelude::*;
use std::fs;
use std::fs::File;
+use std::io::prelude::*;
/// Wrapper for a node id.
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
diff --git a/wotb/rusty.rs b/wotb/rusty.rs
index be68c8a4..b87ed0e8 100644
--- a/wotb/rusty.rs
+++ b/wotb/rusty.rs
@@ -15,15 +15,15 @@
//! Experimental implementation of the Web of Trust in a more "rusty" style.
-use std::collections::HashSet;
use rayon::prelude::*;
+use std::collections::HashSet;
+use HasLinkResult;
+use NewLinkResult;
+use RemLinkResult;
use WebOfTrust;
use WotDistance;
use WotDistanceParameters;
-use HasLinkResult;
-use RemLinkResult;
-use NewLinkResult;
use NodeId;
--
GitLab