Get rid of wildcard imports

core/cli/src/informant.rs

@@ -25,7 +25,7 @@ use tokio::runtime::TaskExecutor;
 use sysinfo::{get_current_pid, ProcessExt, System, SystemExt};
 use network::{SyncState, SyncProvider};
 use client::{backend::Backend, BlockchainEvents};
-use substrate_telemetry::*;
+use substrate_telemetry::SUBSTRATE_INFO;
 use log::{info, warn};
 
 use runtime_primitives::generic::BlockId;

core/cli/src/lib.rs

@@ -19,6 +19,9 @@
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
 
+#[macro_use(telemetry)]
+extern crate substrate_telemetry;
+
 #[macro_use]
 mod traits;
 mod params;

core/client/src/client.rs

@@ -61,7 +61,7 @@ use crate::in_mem;
 use crate::block_builder::{self, api::BlockBuilder as BlockBuilderAPI};
 use crate::genesis;
 use consensus;
-use substrate_telemetry::*;
+use substrate_telemetry::SUBSTRATE_INFO;
 
 use log::{info, trace, warn};
 use error_chain::bail;

core/client/src/lib.rs

@@ -20,6 +20,9 @@
 #![warn(missing_docs)]
 #![recursion_limit="128"]
 
+#[macro_use(telemetry)]
+extern crate substrate_telemetry;
+
 #[macro_use]
 pub mod runtime_api;
 #[cfg(feature = "std")]

core/consensus/aura/src/lib.rs

@@ -26,6 +26,9 @@
 //! Blocks from future steps will be either deferred or rejected depending on how
 //! far in the future they are.
 
+#[macro_use(telemetry)]
+extern crate substrate_telemetry;
+
 use std::{sync::Arc, time::Duration, thread};
 
 use parity_codec::Encode;
@@ -52,7 +55,7 @@ use srml_aura::{
 	InherentType as AuraInherent, AuraInherentData,
 	timestamp::{TimestampInherentData, InherentType as TimestampInherent, InherentError as TIError}
 };
-use substrate_telemetry::*;
+use substrate_telemetry::{CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
 
 use aura_slots::{CheckedHeader, SlotWorker, SlotInfo, SlotCompatible};
 

core/finality-grandpa/src/lib.rs

@@ -52,6 +52,9 @@
 //! or prune any signaled changes based on whether the signaling block is
 //! included in the newly-finalized chain.
 
+#[macro_use(telemetry)]
+extern crate substrate_telemetry;
+
 use futures::prelude::*;
 use log::{debug, info, warn, trace};
 use futures::sync::{self, mpsc, oneshot};
@@ -69,7 +72,7 @@ use runtime_primitives::traits::{
 use fg_primitives::GrandpaApi;
 use runtime_primitives::generic::BlockId;
 use substrate_primitives::{ed25519, H256, Ed25519AuthorityId, Blake2Hasher};
-use substrate_telemetry::*;
+use substrate_telemetry::{CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_WARN};
 
 use grandpa::Error as GrandpaError;
 use grandpa::{voter, round::State as RoundState, BlockNumberOps, VoterSet};

core/service/src/lib.rs

@@ -19,6 +19,9 @@
 
 #![warn(unused_extern_crates)]
 
+#[macro_use(telemetry)]
+extern crate tel;
+
 mod components;
 mod error;
 mod chain_spec;
@@ -41,7 +44,7 @@ use exit_future::Signal;
 pub use tokio::runtime::TaskExecutor;
 use substrate_executor::NativeExecutor;
 use parity_codec::{Encode, Decode};
-use tel::*;
+use tel::SUBSTRATE_INFO;
 
 pub use self::error::{ErrorKind, Error};
 pub use config::{Configuration, Roles, PruningMode};