From 99d1dde1800fe30b58fd537450189aabbd1aae64 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Sat, 1 Feb 2020 18:49:15 +0100
Subject: [PATCH] [ref] common-tools: fatal-error! expansion must not need
import
---
lib/core/conf/src/lib.rs | 2 --
lib/core/module/src/lib.rs | 1 -
lib/crypto/src/hashs/mod.rs | 1 -
lib/crypto/src/rand.rs | 1 -
lib/crypto/src/seeds.rs | 1 -
lib/dubp/user-docs/src/lib.rs | 2 --
lib/dubp/wot/operations/density.rs | 1 -
lib/dunp/network-documents/src/lib.rs | 2 --
lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs | 1 -
lib/modules-lib/bc-db-reader/src/currency_params.rs | 1 -
lib/modules-lib/bc-db-reader/src/indexes/sources.rs | 1 -
lib/modules-lib/bc-db-reader/src/tools.rs | 1 -
lib/modules/tui/tui.rs | 2 +-
lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs | 1 -
lib/modules/ws2p/ws2p-messages/lib.rs | 2 --
lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs | 1 -
lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs | 1 -
.../ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs | 1 -
.../ws2p-protocol/src/controller/on_message/connect_msg.rs | 1 -
.../ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs | 1 -
lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs | 1 -
lib/tools/common-tools/src/macros/fatal_error.rs | 6 +++---
22 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/lib/core/conf/src/lib.rs b/lib/core/conf/src/lib.rs
index f1d979d9..e7dec054 100644
--- a/lib/core/conf/src/lib.rs
+++ b/lib/core/conf/src/lib.rs
@@ -29,8 +29,6 @@
unused_qualifications
)]
-#[macro_use]
-extern crate log;
#[macro_use]
extern crate serde_derive;
diff --git a/lib/core/module/src/lib.rs b/lib/core/module/src/lib.rs
index e65d654d..4fce3070 100644
--- a/lib/core/module/src/lib.rs
+++ b/lib/core/module/src/lib.rs
@@ -41,7 +41,6 @@ use durs_common_tools::fatal_error;
use durs_common_tools::traits::merge::Merge;
use durs_network_documents::network_endpoint::{ApiPart, EndpointEnum};
use failure::Fail;
-use log::error;
use serde::de::DeserializeOwned;
use serde::ser::{Serialize, Serializer};
use std::collections::HashSet;
diff --git a/lib/crypto/src/hashs/mod.rs b/lib/crypto/src/hashs/mod.rs
index 963a0030..81e5e43c 100644
--- a/lib/crypto/src/hashs/mod.rs
+++ b/lib/crypto/src/hashs/mod.rs
@@ -17,7 +17,6 @@
use crate::bases::*;
use durs_common_tools::fatal_error;
-use log::error;
use ring::{digest, rand};
use std::fmt::{Debug, Display, Error, Formatter};
diff --git a/lib/crypto/src/rand.rs b/lib/crypto/src/rand.rs
index 313cd60f..e6184dc1 100644
--- a/lib/crypto/src/rand.rs
+++ b/lib/crypto/src/rand.rs
@@ -17,7 +17,6 @@
use byteorder::ByteOrder;
use durs_common_tools::fatal_error;
-use log::error;
use ring::rand;
#[inline]
diff --git a/lib/crypto/src/seeds.rs b/lib/crypto/src/seeds.rs
index cfa56046..ab9d9f68 100644
--- a/lib/crypto/src/seeds.rs
+++ b/lib/crypto/src/seeds.rs
@@ -19,7 +19,6 @@ use crate::bases::b58::{bytes_to_str_base58, ToBase58};
use crate::bases::*;
use clear_on_drop::clear::Clear;
use durs_common_tools::fatal_error;
-use log::error;
use ring::rand;
use std::fmt::{self, Debug, Display, Formatter};
diff --git a/lib/dubp/user-docs/src/lib.rs b/lib/dubp/user-docs/src/lib.rs
index fd680b61..f1c129af 100644
--- a/lib/dubp/user-docs/src/lib.rs
+++ b/lib/dubp/user-docs/src/lib.rs
@@ -27,8 +27,6 @@
unused_import_braces
)]
-#[macro_use]
-extern crate log;
#[macro_use]
extern crate failure;
#[cfg(test)]
diff --git a/lib/dubp/wot/operations/density.rs b/lib/dubp/wot/operations/density.rs
index f77def8a..e24584ee 100644
--- a/lib/dubp/wot/operations/density.rs
+++ b/lib/dubp/wot/operations/density.rs
@@ -17,7 +17,6 @@
use crate::data::WebOfTrust;
use durs_common_tools::fatal_error;
-use log::error;
/// Compute average density
pub fn calculate_average_density<T: WebOfTrust>(wot: &T) -> usize {
diff --git a/lib/dunp/network-documents/src/lib.rs b/lib/dunp/network-documents/src/lib.rs
index b1f51739..08ad5454 100644
--- a/lib/dunp/network-documents/src/lib.rs
+++ b/lib/dunp/network-documents/src/lib.rs
@@ -32,8 +32,6 @@ extern crate pest_derive;
#[cfg(test)]
#[macro_use]
extern crate pretty_assertions;
-#[macro_use]
-extern crate log;
pub mod host;
pub mod network_endpoint;
diff --git a/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs b/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs
index a522a728..3bb1888c 100644
--- a/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs
+++ b/lib/modules-lib/bc-db-reader/src/blocks/fork_tree.rs
@@ -16,7 +16,6 @@
//! Blocks fork tree: define entity and read requests.
use dubp_common_doc::{BlockHash, BlockNumber, Blockstamp};
-use log::error;
use serde::de::{self, Deserializer, Visitor};
use serde::{Deserialize, Serialize, Serializer};
use std::collections::{HashMap, HashSet};
diff --git a/lib/modules-lib/bc-db-reader/src/currency_params.rs b/lib/modules-lib/bc-db-reader/src/currency_params.rs
index bed6d8cc..7e131244 100644
--- a/lib/modules-lib/bc-db-reader/src/currency_params.rs
+++ b/lib/modules-lib/bc-db-reader/src/currency_params.rs
@@ -21,7 +21,6 @@ use dubp_currency_params::db::write_currency_params;
use dubp_currency_params::genesis_block_params::GenesisBlockParams;
use dubp_currency_params::CurrencyParameters;
use durs_common_tools::fatal_error;
-use log::error;
use std::path::PathBuf;
use unwrap::unwrap;
diff --git a/lib/modules-lib/bc-db-reader/src/indexes/sources.rs b/lib/modules-lib/bc-db-reader/src/indexes/sources.rs
index b721db72..073b8996 100644
--- a/lib/modules-lib/bc-db-reader/src/indexes/sources.rs
+++ b/lib/modules-lib/bc-db-reader/src/indexes/sources.rs
@@ -22,7 +22,6 @@ use dubp_indexes::sindex::UniqueIdUTXOv10;
use dubp_user_docs::documents::transaction::*;
use durs_common_tools::fatal_error;
use durs_dbs_tools::DbError;
-use log::error;
use serde::{Deserialize, Serialize};
use std::cmp::Ordering;
use std::collections::HashMap;
diff --git a/lib/modules-lib/bc-db-reader/src/tools.rs b/lib/modules-lib/bc-db-reader/src/tools.rs
index cda4c980..5b1515dc 100644
--- a/lib/modules-lib/bc-db-reader/src/tools.rs
+++ b/lib/modules-lib/bc-db-reader/src/tools.rs
@@ -19,7 +19,6 @@ use crate::blocks::BlockDb;
use dubp_block_doc::block::BlockDocumentTrait;
use dup_crypto::keys::PubKey;
use durs_common_tools::fatal_error;
-use log::error;
use std::collections::HashMap;
/// Compute median issuers frame
diff --git a/lib/modules/tui/tui.rs b/lib/modules/tui/tui.rs
index d5b00ee8..5c4dbe46 100644
--- a/lib/modules/tui/tui.rs
+++ b/lib/modules/tui/tui.rs
@@ -40,7 +40,7 @@ use durs_module::*;
use durs_network::events::NetworkEvent;
use durs_network_documents::network_head::NetworkHead;
use durs_network_documents::NodeFullId;
-use log::{debug, error, trace, warn};
+use log::{debug, trace, warn};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::io::{stdout, Write};
diff --git a/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs b/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs
index 689d0a3e..698fce42 100644
--- a/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs
+++ b/lib/modules/ws2p-v1-legacy/src/ws_connections/handler.rs
@@ -22,7 +22,6 @@ use crate::constants::*;
use crate::*;
use dup_crypto::keys::*;
use durs_common_tools::fatal_error;
-use log::error;
use std::sync::mpsc;
#[allow(deprecated)]
use ws::util::{Timeout, Token};
diff --git a/lib/modules/ws2p/ws2p-messages/lib.rs b/lib/modules/ws2p/ws2p-messages/lib.rs
index 13df8c6e..3ca06a21 100644
--- a/lib/modules/ws2p/ws2p-messages/lib.rs
+++ b/lib/modules/ws2p/ws2p-messages/lib.rs
@@ -35,8 +35,6 @@ extern crate pretty_assertions;*/
#[macro_use]
extern crate serde_derive;
-#[macro_use]
-extern crate log;
/// WS2Pv2 Messages
pub mod v2;
diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs
index 8bac4b6a..bee84727 100644
--- a/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs
+++ b/lib/modules/ws2p/ws2p-protocol/src/controller/meta_datas.rs
@@ -26,7 +26,6 @@ use durs_network_documents::network_peer::PeerCardV11;
use durs_network_documents::NodeFullId;
use durs_ws2p_messages::v2::api_features::WS2PFeatures;
use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType;
-use log::error;
use std::time::Instant;
#[derive(Debug)]
diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs
index 41c7561a..fdd28426 100644
--- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs
+++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message.rs
@@ -30,7 +30,6 @@ use durs_module::ModuleMessage;
use durs_network_documents::NodeFullId;
use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload;
use durs_ws2p_messages::WS2PMessage;
-use log::error;
use std::ops::Deref;
use std::thread;
use std::time::{Duration, Instant};
diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs
index c987782c..579ae3ac 100644
--- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs
+++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ack_msg.rs
@@ -24,7 +24,6 @@ use durs_module::ModuleMessage;
use durs_ws2p_messages::v2::ok::WS2Pv2OkMsg;
use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload;
use durs_ws2p_messages::v2::WS2Pv2Message;
-use log::error;
/// Process WS2P v2+ ACK Message
pub fn process_ws2p_v2p_ack_msg<M: ModuleMessage>(
diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs
index e8f7ec69..1640715e 100644
--- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs
+++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/connect_msg.rs
@@ -25,7 +25,6 @@ use durs_network_documents::NodeFullId;
use durs_ws2p_messages::v2::connect::{WS2Pv2ConnectMsg, WS2Pv2ConnectType};
use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload;
use durs_ws2p_messages::v2::WS2Pv2Message;
-use log::error;
use unwrap::unwrap;
/// Process WS2P v2+ CONNECT Message
diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs
index 6dd2ee4a..7cb16efc 100644
--- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs
+++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_message/ok_msg.rs
@@ -22,7 +22,6 @@ use crate::controller::{
use durs_common_tools::fatal_error;
use durs_module::ModuleMessage;
use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType;
-use log::error;
use unwrap::unwrap;
/// Process WS2P v2+ OK Message
diff --git a/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs b/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs
index ca8c4d21..044ba600 100644
--- a/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs
+++ b/lib/modules/ws2p/ws2p-protocol/src/controller/on_open.rs
@@ -24,7 +24,6 @@ use durs_module::ModuleMessage;
use durs_ws2p_messages::v2::connect::generate_connect_message;
use durs_ws2p_messages::v2::payload_container::WS2Pv2MessagePayload;
use durs_ws2p_messages::v2::WS2Pv2Message;
-use log::error;
use std::net::SocketAddr;
pub fn process<M: ModuleMessage>(
diff --git a/lib/tools/common-tools/src/macros/fatal_error.rs b/lib/tools/common-tools/src/macros/fatal_error.rs
index f1e51b1a..1d3b3657 100644
--- a/lib/tools/common-tools/src/macros/fatal_error.rs
+++ b/lib/tools/common-tools/src/macros/fatal_error.rs
@@ -20,15 +20,15 @@
#[macro_export]
macro_rules! fatal_error {
($msg:expr) => ({
- error!("{}", &dbg!($msg));
+ log::error!("{}", &dbg!($msg));
panic!($msg);
});
($msg:expr,) => ({
- error!("{}", &dbg!($msg));
+ log::error!("{}", &dbg!($msg));
panic!($msg);
});
($fmt:expr, $($arg:tt)+) => ({
- error!("{}", dbg!(format!($fmt, $($arg)+)));
+ log::error!("{}", dbg!(format!($fmt, $($arg)+)));
panic!($fmt, $($arg)+);
});
}
--
GitLab