Remove useless TryInto/TryFrom imports

bin/node/cli/src/service.rs

@@ -562,7 +562,7 @@ mod tests {
 		RuntimeAppPublic,
 	};
 	use sp_timestamp;
-	use std::{borrow::Cow, convert::TryInto, sync::Arc};
+	use std::{borrow::Cow, sync::Arc};
 
 	type AccountPublic = <Signature as Verify>::Signer;
 

bin/node/cli/tests/common.rs

@@ -26,7 +26,6 @@ use nix::{
 use node_primitives::Block;
 use remote_externalities::rpc_api;
 use std::{
-	convert::TryInto,
 	ops::{Deref, DerefMut},
 	path::Path,
 	process::{Child, Command, ExitStatus},

bin/node/cli/tests/running_the_node_and_interrupt.rs

@@ -25,10 +25,7 @@ use nix::{
 	},
 	unistd::Pid,
 };
-use std::{
-	convert::TryInto,
-	process::{Child, Command},
-};
+use std::process::{Child, Command};
 use tempfile::tempdir;
 
 pub mod common;

bin/node/cli/tests/telemetry.rs

@@ -21,7 +21,7 @@ use nix::{
 	sys::signal::{kill, Signal::SIGINT},
 	unistd::Pid,
 };
-use std::{convert::TryInto, process};
+use std::process;
 
 pub mod common;
 pub mod websocket_server;

bin/node/cli/tests/temp_base_path_works.rs

@@ -25,7 +25,6 @@ use nix::{
 };
 use regex::Regex;
 use std::{
-	convert::TryInto,
 	io::Read,
 	path::PathBuf,
 	process::{Command, Stdio},

client/allocator/src/freeing_bump.rs

@@ -71,7 +71,6 @@ use crate::Error;
 pub use sp_core::MAX_POSSIBLE_ALLOCATION;
 use sp_wasm_interface::{Pointer, WordSize};
 use std::{
-	convert::{TryFrom, TryInto},
 	mem,
 	ops::{Index, IndexMut, Range},
 };

client/api/src/client.rs

@@ -25,7 +25,7 @@ use sp_runtime::{
 	traits::{Block as BlockT, NumberFor},
 	Justifications,
 };
-use std::{collections::HashSet, convert::TryFrom, fmt, sync::Arc};
+use std::{collections::HashSet, fmt, sync::Arc};
 
 use crate::{blockchain::Info, notifications::StorageEventStream, FinalizeSummary, ImportSummary};
 

client/authority-discovery/src/worker.rs

@@ -24,7 +24,6 @@ use crate::{
 
 use std::{
 	collections::{HashMap, HashSet},
-	convert::TryInto,
 	marker::PhantomData,
 	sync::Arc,
 	time::Duration,
@@ -581,14 +580,11 @@ where
 			.authorities(&id)
 			.map_err(|e| Error::CallingRuntime(e.into()))?
 			.into_iter()
-			.map(std::convert::Into::into)
+			.map(Into::into)
 			.collect::<HashSet<_>>();
 
-		let intersection = local_pub_keys
-			.intersection(&authorities)
-			.cloned()
-			.map(std::convert::Into::into)
-			.collect();
+		let intersection =
+			local_pub_keys.intersection(&authorities).cloned().map(Into::into).collect();
 
 		Ok(intersection)
 	}

client/beefy/src/keystore.rs

@@ -16,8 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::convert::{From, TryInto};
-
 use sp_application_crypto::RuntimeAppPublic;
 use sp_core::keccak_256;
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};

client/cli/src/commands/insert_key.rs

@@ -25,7 +25,7 @@ use sc_keystore::LocalKeystore;
 use sc_service::config::{BasePath, KeystoreConfig};
 use sp_core::crypto::{KeyTypeId, SecretString};
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
-use std::{convert::TryFrom, sync::Arc};
+use std::sync::Arc;
 
 /// The `insert` command
 #[derive(Debug, Clone, Parser)]

client/cli/src/commands/utils.rs

@@ -31,7 +31,7 @@ use sp_core::{
 	Pair,
 };
 use sp_runtime::{traits::IdentifyAccount, MultiSigner};
-use std::{convert::TryFrom, io::Read, path::PathBuf};
+use std::{io::Read, path::PathBuf};
 
 /// Public key type for Runtime
 pub type PublicFor<P> = <P as sp_core::Pair>::Public;

client/cli/src/commands/verify.rs

@@ -66,7 +66,7 @@ impl VerifyCmd {
 fn verify<Pair>(sig_data: Vec<u8>, message: Vec<u8>, uri: &str) -> error::Result<()>
 where
 	Pair: sp_core::Pair,
-	Pair::Signature: for<'a> std::convert::TryFrom<&'a [u8]>,
+	Pair::Signature: for<'a> TryFrom<&'a [u8]>,
 {
 	let signature =
 		Pair::Signature::try_from(&sig_data).map_err(|_| error::Error::SignatureFormatInvalid)?;

client/cli/src/error.rs

@@ -80,19 +80,19 @@ pub enum Error {
 	GlobalLoggerError(#[from] sc_tracing::logging::Error),
 }
 
-impl std::convert::From<&str> for Error {
+impl From<&str> for Error {
 	fn from(s: &str) -> Error {
 		Error::Input(s.to_string())
 	}
 }
 
-impl std::convert::From<String> for Error {
+impl From<String> for Error {
 	fn from(s: String) -> Error {
 		Error::Input(s)
 	}
 }
 
-impl std::convert::From<crypto::PublicError> for Error {
+impl From<crypto::PublicError> for Error {
 	fn from(e: crypto::PublicError) -> Error {
 		Error::InvalidUri(e)
 	}

client/cli/src/params/mod.rs

@@ -32,7 +32,7 @@ use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, NumberFor},
 };
-use std::{convert::TryFrom, fmt::Debug, str::FromStr};
+use std::{fmt::Debug, str::FromStr};
 
 pub use crate::params::{
 	database_params::*, import_params::*, keystore_params::*, network_params::*,

client/consensus/aura/src/lib.rs

@@ -30,14 +30,7 @@
 //!
 //! NOTE: Aura itself is designed to be generic over the crypto used.
 #![forbid(missing_docs, unsafe_code)]
-use std::{
-	convert::{TryFrom, TryInto},
-	fmt::Debug,
-	hash::Hash,
-	marker::PhantomData,
-	pin::Pin,
-	sync::Arc,
-};
+use std::{fmt::Debug, hash::Hash, marker::PhantomData, pin::Pin, sync::Arc};
 
 use futures::prelude::*;
 use log::{debug, trace};
@@ -517,7 +510,7 @@ pub enum Error<B: BlockT> {
 	Inherent(sp_inherents::Error),
 }
 
-impl<B: BlockT> std::convert::From<Error<B>> for String {
+impl<B: BlockT> From<Error<B>> for String {
 	fn from(error: Error<B>) -> String {
 		error.to_string()
 	}

client/consensus/babe/src/lib.rs

@@ -69,7 +69,6 @@
 use std::{
 	borrow::Cow,
 	collections::{HashMap, HashSet},
-	convert::TryInto,
 	future::Future,
 	pin::Pin,
 	sync::Arc,
@@ -320,7 +319,7 @@ pub enum Error<B: BlockT> {
 	ForkTree(Box<fork_tree::Error<sp_blockchain::Error>>),
 }
 
-impl<B: BlockT> std::convert::From<Error<B>> for String {
+impl<B: BlockT> From<Error<B>> for String {
 	fn from(error: Error<B>) -> String {
 		error.to_string()
 	}

client/consensus/manual-seal/src/error.rs

@@ -102,7 +102,7 @@ impl Error {
 	}
 }
 
-impl std::convert::From<Error> for jsonrpc_core::Error {
+impl From<Error> for jsonrpc_core::Error {
 	fn from(error: Error) -> Self {
 		jsonrpc_core::Error {
 			code: jsonrpc_core::ErrorCode::ServerError(error.to_code()),

client/consensus/pow/src/lib.rs

@@ -119,13 +119,13 @@ pub enum Error<B: BlockT> {
 	Other(String),
 }
 
-impl<B: BlockT> std::convert::From<Error<B>> for String {
+impl<B: BlockT> From<Error<B>> for String {
 	fn from(error: Error<B>) -> String {
 		error.to_string()
 	}
 }
 
-impl<B: BlockT> std::convert::From<Error<B>> for ConsensusError {
+impl<B: BlockT> From<Error<B>> for ConsensusError {
 	fn from(error: Error<B>) -> ConsensusError {
 		ConsensusError::ClientImport(error.to_string())
 	}

client/db/src/utils.rs

@@ -19,7 +19,7 @@
 //! Db-based backend utility structures and functions, used by both
 //! full and light storages.
 
-use std::{convert::TryInto, fmt, fs, io, path::Path, sync::Arc};
+use std::{fmt, fs, io, path::Path, sync::Arc};
 
 use log::{debug, info};
 

client/executor/common/src/sandbox/wasmer_backend.rs

@@ -26,7 +26,7 @@ use crate::{
 use codec::{Decode, Encode};
 use sp_core::sandbox::HostError;
 use sp_wasm_interface::{FunctionContext, Pointer, ReturnValue, Value, WordSize};
-use std::{cell::RefCell, collections::HashMap, convert::TryInto, rc::Rc};
+use std::{cell::RefCell, collections::HashMap, rc::Rc};
 use wasmer::RuntimeError;
 
 use crate::sandbox::{

client/finality-grandpa/rpc/src/lib.rs

@@ -171,7 +171,7 @@ where
 mod tests {
 	use super::*;
 	use jsonrpc_core::{types::Params, Notification, Output};
-	use std::{collections::HashSet, convert::TryInto, sync::Arc};
+	use std::{collections::HashSet, sync::Arc};
 
 	use parity_scale_codec::{Decode, Encode};
 	use sc_block_builder::{BlockBuilder, RecordProof};

client/informant/src/display.rs

@@ -22,11 +22,7 @@ use log::info;
 use sc_client_api::ClientInfo;
 use sc_network::{NetworkStatus, SyncState, WarpSyncPhase, WarpSyncProgress};
 use sp_runtime::traits::{Block as BlockT, CheckedDiv, NumberFor, Saturating, Zero};
-use std::{
-	convert::{TryFrom, TryInto},
-	fmt,
-	time::Instant,
-};
+use std::{fmt, time::Instant};
 
 /// State of the informant display system.
 ///

client/network-gossip/src/bridge.rs

@@ -303,7 +303,6 @@ mod tests {
 	use sp_runtime::{testing::H256, traits::Block as BlockT};
 	use std::{
 		borrow::Cow,
-		convert::TryInto,
 		sync::{Arc, Mutex},
 	};
 	use substrate_test_runtime_client::runtime::Block;

client/network/src/config.rs

@@ -50,7 +50,6 @@ use sp_runtime::traits::Block as BlockT;
 use std::{
 	borrow::Cow,
 	collections::HashMap,
-	convert::TryFrom,
 	error::Error,
 	fs,
 	future::Future,

client/network/src/protocol.rs

@@ -60,7 +60,6 @@ use sp_runtime::{
 use std::{
 	borrow::Cow,
 	collections::{HashMap, HashSet, VecDeque},
-	convert::TryFrom as _,
 	io, iter,
 	num::NonZeroUsize,
 	pin::Pin,

client/network/src/protocol/notifications/upgrade/notifications.rs

@@ -41,7 +41,7 @@ use libp2p::core::{upgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use log::{error, warn};
 use std::{
 	borrow::Cow,
-	convert::{Infallible, TryFrom as _},
+	convert::Infallible,
 	io, mem,
 	pin::Pin,
 	task::{Context, Poll},

client/network/src/request_responses.rs

@@ -56,7 +56,6 @@ use libp2p::{
 use std::{
 	borrow::Cow,
 	collections::{hash_map::Entry, HashMap},
-	convert::TryFrom as _,
 	io, iter,
 	pin::Pin,
 	task::{Context, Poll},

client/network/src/service.rs

@@ -73,7 +73,6 @@ use std::{
 	borrow::Cow,
 	cmp,
 	collections::{HashMap, HashSet},
-	convert::TryFrom as _,
 	fs, iter,
 	marker::PhantomData,
 	num::NonZeroUsize,

client/network/src/service/out_events.rs

@@ -38,7 +38,6 @@ use parking_lot::Mutex;
 use prometheus_endpoint::{register, CounterVec, GaugeVec, Opts, PrometheusError, Registry, U64};
 use std::{
 	cell::RefCell,
-	convert::TryFrom as _,
 	fmt,
 	pin::Pin,
 	sync::Arc,

client/offchain/src/api.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{collections::HashSet, convert::TryFrom, str::FromStr, sync::Arc, thread::sleep};
+use std::{collections::HashSet, str::FromStr, sync::Arc, thread::sleep};
 
 use crate::NetworkProvider;
 use codec::{Decode, Encode};
@@ -327,10 +327,7 @@ mod tests {
 	use sc_client_db::offchain::LocalStorage;
 	use sc_network::{NetworkStateInfo, PeerId};
 	use sp_core::offchain::{DbExternalities, Externalities};
-	use std::{
-		convert::{TryFrom, TryInto},
-		time::SystemTime,
-	};
+	use std::time::SystemTime;
 
 	pub(super) struct TestNetwork();
 

client/offchain/src/api/http.rs

@@ -37,7 +37,6 @@ use once_cell::sync::Lazy;
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_core::offchain::{HttpError, HttpRequestId, HttpRequestStatus, Timestamp};
 use std::{
-	convert::TryFrom,
 	fmt,
 	io::Read as _,
 	pin::Pin,

client/offchain/src/api/timestamp.rs

@@ -19,10 +19,7 @@
 //! Helper methods dedicated to timestamps.
 
 use sp_core::offchain::Timestamp;
-use std::{
-	convert::TryInto,
-	time::{Duration, SystemTime},
-};
+use std::time::{Duration, SystemTime};
 
 /// Returns the current time as a `Timestamp`.
 pub fn now() -> Timestamp {

client/rpc/src/author/mod.rs

@@ -21,7 +21,7 @@
 #[cfg(test)]
 mod tests;
 
-use std::{convert::TryInto, sync::Arc};
+use std::sync::Arc;
 
 use sp_blockchain::HeaderBackend;
 

client/service/src/chain_ops/import_blocks.rs

@@ -35,7 +35,6 @@ use sp_runtime::{
 	},
 };
 use std::{
-	convert::{TryFrom, TryInto},
 	io::Read,
 	pin::Pin,
 	task::Poll,

client/service/src/config.rs

@@ -294,7 +294,7 @@ impl BasePath {
 	}
 }
 
-impl std::convert::From<PathBuf> for BasePath {
+impl From<PathBuf> for BasePath {
 	fn from(path: PathBuf) -> Self {
 		BasePath::new(path)
 	}

client/service/src/metrics.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{convert::TryFrom, time::SystemTime};
+use std::time::SystemTime;
 
 use crate::config::Configuration;
 use futures_timer::Delay;